Regenerated for release 1.9.2.
diff --git a/aclocal.m4 b/aclocal.m4
index a37f18e..86f0e02 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -918,7 +918,7 @@
   shlibpath_var="$acl_cv_shlibpath_var"
 ])
 
-# lib-ld.m4 serial 2 (gettext-0.12)
+# lib-ld.m4 serial 3 (gettext-0.12.2)
 dnl Copyright (C) 1996-2003 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
@@ -934,11 +934,12 @@
 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 ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
-else
-  acl_cv_prog_gnu_ld=no
-fi])
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
@@ -1008,11 +1009,12 @@
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
+      case `"$acl_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="$ac_save_ifs"
@@ -7108,7 +7110,7 @@
   fi
 ])
 
-# lib-prefix.m4 serial 2 (gettext-0.12)
+# lib-prefix.m4 serial 3 (gettext-0.12.2)
 dnl Copyright (C) 2001-2003 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
@@ -7123,7 +7125,7 @@
 dnl require excessive bracketing.
 ifdef([AC_HELP_STRING],
 [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
 
 dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
 dnl to access previously installed libraries. The basic assumption is that
@@ -7816,7 +7818,7 @@
   done
 ])
 
-# gettext.m4 serial 20 (gettext-0.12)
+# gettext.m4 serial 22 (gettext-0.12.2)
 dnl Copyright (C) 1995-2003 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
@@ -8172,9 +8174,18 @@
   AC_REQUIRE([AC_ISC_POSIX])dnl
   AC_REQUIRE([AC_HEADER_STDC])dnl
   AC_REQUIRE([AC_C_CONST])dnl
+  AC_REQUIRE([bh_C_SIGNED])dnl
   AC_REQUIRE([AC_C_INLINE])dnl
   AC_REQUIRE([AC_TYPE_OFF_T])dnl
   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
+  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+  AC_REQUIRE([gt_TYPE_WINT_T])dnl
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gt_TYPE_INTMAX_T])
+  AC_REQUIRE([gt_PRINTF_POSIX])
   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
   AC_REQUIRE([AC_FUNC_MMAP])dnl
   AC_REQUIRE([jm_GLIBC21])dnl
@@ -8183,12 +8194,45 @@
   AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
   AC_REQUIRE([gt_INTTYPES_PRI])dnl
 
+  AC_CHECK_TYPES([ptrdiff_t])
   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \
-__fsetlocking])
+  AC_CHECK_FUNCS([asprintf getcwd getegid geteuid getgid getuid mempcpy \
+munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup strtoul \
+tsearch wprintf __argz_count __argz_stringify __argz_next __fsetlocking])
+
+  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).
+  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>])
+  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+  case $gt_cv_func_printf_posix in
+    *yes) HAVE_POSIX_PRINTF=1 ;;
+    *) HAVE_POSIX_PRINTF=0 ;;
+  esac
+  AC_SUBST([HAVE_POSIX_PRINTF])
+  if test "$ac_cv_func_asprintf" = yes; then
+    HAVE_ASPRINTF=1
+  else
+    HAVE_ASPRINTF=0
+  fi
+  AC_SUBST([HAVE_ASPRINTF])
+  if test "$ac_cv_func_snprintf" = yes; then
+    HAVE_SNPRINTF=1
+  else
+    HAVE_SNPRINTF=0
+  fi
+  AC_SUBST([HAVE_SNPRINTF])
+  if test "$ac_cv_func_wprintf" = yes; then
+    HAVE_WPRINTF=1
+  else
+    HAVE_WPRINTF=0
+  fi
+  AC_SUBST([HAVE_WPRINTF])
 
   AM_ICONV
   AM_LANGINFO_CODESET
@@ -8229,6 +8273,26 @@
 ])
 
 
+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.])
+])
+
+
 dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
 AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 
@@ -8572,6 +8636,267 @@
 AC_SUBST($1)dnl
 ])
 
+# signed.m4 serial 1 (gettext-0.10.40)
+dnl Copyright (C) 2001-2002 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.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([bh_C_SIGNED],
+[
+  AC_CACHE_CHECK([for signed], bh_cv_c_signed,
+   [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
+  if test $bh_cv_c_signed = no; then
+    AC_DEFINE(signed, ,
+              [Define to empty if the C compiler doesn't support this keyword.])
+  fi
+])
+
+# longlong.m4 serial 4
+dnl Copyright (C) 1999-2003 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.
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG if 'long long' works.
+
+AC_DEFUN([jm_AC_TYPE_LONG_LONG],
+[
+  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
+  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
+    [long long llmax = (long long) -1;
+     return ll << i | ll >> i | llmax / ll | llmax % ll;],
+    ac_cv_type_long_long=yes,
+    ac_cv_type_long_long=no)])
+  if test $ac_cv_type_long_long = yes; then
+    AC_DEFINE(HAVE_LONG_LONG, 1,
+      [Define if you have the 'long long' type.])
+  fi
+])
+
+# longdouble.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 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.
+
+dnl From Bruno Haible.
+dnl Test whether the compiler supports the 'long double' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_LONGDOUBLE],
+[
+  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
+    [if test "$GCC" = yes; then
+       gt_cv_c_long_double=yes
+     else
+       AC_TRY_COMPILE([
+         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
+         long double foo = 0.0;
+         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
+         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+         ], ,
+         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
+     fi])
+  if test $gt_cv_c_long_double = yes; then
+    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
+  fi
+])
+
+# wchar_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 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.
+
+dnl From Bruno Haible.
+dnl Test whether <stddef.h> has the 'wchar_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WCHAR_T],
+[
+  AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
+    [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
+])
+
+# wint_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2003 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.
+
+dnl From Bruno Haible.
+dnl Test whether <wchar.h> has the 'wint_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+  AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
+    [AC_TRY_COMPILE([#include <wchar.h>
+       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
+])
+
+# inttypes_h.m4 serial 5 (gettext-0.12)
+dnl Copyright (C) 1997-2003 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.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <inttypes.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    jm_ac_cv_header_inttypes_h=yes,
+    jm_ac_cv_header_inttypes_h=no)])
+  if test $jm_ac_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>,
+       and declares uintmax_t. ])
+  fi
+])
+
+# stdint_h.m4 serial 3 (gettext-0.12)
+dnl Copyright (C) 1997-2003 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.
+
+dnl From Paul Eggert.
+
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([jm_AC_HEADER_STDINT_H],
+[
+  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <stdint.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    jm_ac_cv_header_stdint_h=yes,
+    jm_ac_cv_header_stdint_h=no)])
+  if test $jm_ac_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>,
+       and declares uintmax_t. ])
+  fi
+])
+
+# intmax.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 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.
+
+dnl From Bruno Haible.
+dnl Test whether the system has the 'intmax_t' type, but don't attempt to
+dnl find a replacement if it is lacking.
+
+AC_DEFUN([gt_TYPE_INTMAX_T],
+[
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
+    [AC_TRY_COMPILE([
+#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;], 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>.])
+  fi
+])
+
+# printf-posix.m4 serial 1 (gettext-0.12.2)
+dnl Copyright (C) 2003 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.
+
+dnl From Bruno Haible.
+dnl Test whether the printf() function supports POSIX/XSI format strings with
+dnl positions.
+
+AC_DEFUN([gt_PRINTF_POSIX],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
+    gt_cv_func_printf_posix,
+    [
+      AC_TRY_RUN([
+#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);
+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
+      [
+        AC_EGREP_CPP(notposix, [
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__
+  notposix
+#endif
+        ], gt_cv_func_printf_posix="guessing no",
+           gt_cv_func_printf_posix="guessing yes")
+      ])
+    ])
+  case $gt_cv_func_printf_posix in
+    *yes)
+      AC_DEFINE(HAVE_POSIX_PRINTF, 1,
+        [Define if your printf() function supports format strings with positions.])
+      ;;
+  esac
+])
+
 # glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
 dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
@@ -8711,64 +9036,6 @@
   fi
 ])
 
-# inttypes_h.m4 serial 5 (gettext-0.12)
-dnl Copyright (C) 1997-2003 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.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_inttypes_h=yes,
-    jm_ac_cv_header_inttypes_h=no)])
-  if test $jm_ac_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>,
-       and declares uintmax_t. ])
-  fi
-])
-
-# stdint_h.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1997-2003 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.
-
-dnl From Paul Eggert.
-
-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_STDINT_H],
-[
-  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_stdint_h=yes,
-    jm_ac_cv_header_stdint_h=no)])
-  if test $jm_ac_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>,
-       and declares uintmax_t. ])
-  fi
-])
-
 # ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
 dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
@@ -9312,8 +9579,8 @@
 fi
 ])# AC_FUNC_STRERROR_R
 
-# pathmax.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# pathmax.m4 serial 2
+dnl Copyright (C) 2002, 2003 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
@@ -9323,7 +9590,7 @@
 AC_DEFUN([gl_PATHMAX],
 [
   dnl Prerequisites of lib/pathmax.h.
-  AC_CHECK_HEADERS_ONCE(limits.h sys/param.h unistd.h)
+  AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h)
 ])
 
 # setenv.m4 serial 2 (gettext-0.11.1)
@@ -9437,8 +9704,31 @@
   :
 ])
 
-# xreadlink.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# readlink.m4 serial 1
+dnl Copyright (C) 2003 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.
+
+AC_DEFUN([gl_FUNC_READLINK],
+[
+  AC_CHECK_FUNCS(readlink)
+  if test $ac_cv_func_readlink = no; then
+    AC_LIBOBJ(readlink)
+    gl_PREREQ_READLINK
+  fi
+])
+
+# Prerequisites of lib/readlink.c.
+AC_DEFUN([gl_PREREQ_READLINE],
+[
+  :
+])
+
+# xreadlink.m4 serial 3
+dnl Copyright (C) 2002, 2003 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
@@ -9448,6 +9738,30 @@
 AC_DEFUN([gl_XREADLINK],
 [
   dnl Prerequisites of lib/xreadlink.c.
-  AC_CHECK_HEADERS_ONCE(limits.h stdlib.h sys/types.h unistd.h)
+  AC_REQUIRE([gt_TYPE_SSIZE_T])
+  AC_CHECK_HEADERS_ONCE(stdlib.h sys/types.h unistd.h)
+])
+
+# ssize_t.m4 serial 3 (gettext-0.12.2)
+dnl Copyright (C) 2001-2003 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.
+
+dnl From Bruno Haible.
+dnl Test whether ssize_t is defined.
+
+AC_DEFUN([gt_TYPE_SSIZE_T],
+[
+  AC_CACHE_CHECK([for ssize_t], gt_cv_ssize_t,
+    [AC_TRY_COMPILE([#include <sys/types.h>],
+       [int x = sizeof (ssize_t *) + sizeof (ssize_t);],
+       gt_cv_ssize_t=yes, gt_cv_ssize_t=no)])
+  if test $gt_cv_ssize_t = no; then
+    AC_DEFINE(ssize_t, int,
+              [Define as a signed type of the same size as size_t.])
+  fi
 ])
 
diff --git a/config.h.in b/config.h.in
index f9aff90..3999342 100644
--- a/config.h.in
+++ b/config.h.in
@@ -128,9 +128,6 @@
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
-/* 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
 
@@ -146,6 +143,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `readlink' function. */
+#undef HAVE_READLINK
+
 /* Define to 1 if you have the <search.h> header file. */
 #undef HAVE_SEARCH_H
 
@@ -277,3 +277,6 @@
 
 /* Define to a replacement function name for realpath(). */
 #undef realpath
+
+/* Define as a signed type of the same size as size_t. */
+#undef ssize_t
diff --git a/config.h.msvc b/config.h.msvc
index 1b5f8fc..023e7e5 100644
--- a/config.h.msvc
+++ b/config.h.msvc
@@ -127,9 +127,6 @@
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
@@ -145,6 +142,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
+/* Define to 1 if you have the `readlink' function. */
+#undef HAVE_READLINK
+
 /* Define to 1 if you have the <search.h> header file. */
 #define HAVE_SEARCH_H 1
 
@@ -275,3 +275,6 @@
 
 /* Define to a replacement function name for realpath(). */
 #undef realpath
+
+/* Define as a signed type of the same size as size_t. */
+#undef ssize_t
diff --git a/configure b/configure
index a05e179..fe12be0 100755
--- a/configure
+++ b/configure
@@ -3438,11 +3438,12 @@
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
+      case `"$acl_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="$ac_save_ifs"
@@ -3468,11 +3469,12 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
-else
-  acl_cv_prog_gnu_ld=no
-fi
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac
 fi
 echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
@@ -4749,7 +4751,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4752 "configure"' > conftest.$ac_ext
+  echo '#line 4754 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6015,7 +6017,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:6018:" \
+echo "$as_me:6020:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7020,11 +7022,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7023: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7025: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7027: \$? = $ac_status" >&5
+   echo "$as_me:7029: \$? = $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
@@ -7252,11 +7254,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7255: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7257: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7259: \$? = $ac_status" >&5
+   echo "$as_me:7261: \$? = $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
@@ -7319,11 +7321,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7322: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7324: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7326: \$? = $ac_status" >&5
+   echo "$as_me:7328: \$? = $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
@@ -9343,7 +9345,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9346 "configure"
+#line 9348 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9441,7 +9443,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9444 "configure"
+#line 9446 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11573,11 +11575,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11576: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11578: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11580: \$? = $ac_status" >&5
+   echo "$as_me:11582: \$? = $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
@@ -11640,11 +11642,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11643: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11645: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11647: \$? = $ac_status" >&5
+   echo "$as_me:11649: \$? = $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
@@ -12895,7 +12897,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12898 "configure"
+#line 12900 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12993,7 +12995,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12996 "configure"
+#line 12998 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13815,11 +13817,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13818: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13820: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13822: \$? = $ac_status" >&5
+   echo "$as_me:13824: \$? = $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
@@ -13882,11 +13884,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13885: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13887: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13889: \$? = $ac_status" >&5
+   echo "$as_me:13891: \$? = $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
@@ -15834,11 +15836,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15837: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15839: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15841: \$? = $ac_status" >&5
+   echo "$as_me:15843: \$? = $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
@@ -16066,11 +16068,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16069: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16071: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16073: \$? = $ac_status" >&5
+   echo "$as_me:16075: \$? = $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
@@ -16133,11 +16135,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16136: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16138: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16140: \$? = $ac_status" >&5
+   echo "$as_me:16142: \$? = $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
@@ -18157,7 +18159,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18160 "configure"
+#line 18162 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18255,7 +18257,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18258 "configure"
+#line 18260 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -25093,150 +25095,6 @@
 
 
 
-for ac_header in limits.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
   :
 
 
@@ -25250,9 +25108,6 @@
 
 
 
-
-
-
 for ac_func in setenv unsetenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -25900,6 +25755,149 @@
 
 
 
+for ac_func in readlink
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+  if test $ac_cv_func_readlink = no; then
+    LIBOBJS="$LIBOBJS readlink.$ac_objext"
+    gl_PREREQ_READLINK
+  fi
+
+
+  echo "$as_me:$LINENO: checking for ssize_t" >&5
+echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+if test "${gt_cv_ssize_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+int
+main ()
+{
+int x = sizeof (ssize_t *) + sizeof (ssize_t);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gt_cv_ssize_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_ssize_t=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $gt_cv_ssize_t" >&5
+echo "${ECHO_T}$gt_cv_ssize_t" >&6
+  if test $gt_cv_ssize_t = no; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ssize_t int
+_ACEOF
+
+  fi
+
+
+
 for ac_header in sys/types.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -26044,6 +26042,7 @@
 
 
 
+
   :
 
 
@@ -26059,9 +26058,6 @@
 
 
 
-
-
-
 OS=""
 case "$host_os" in
   linux*)   OS="linux" ;;
diff --git a/lib/aliases.gperf b/lib/aliases.gperf
index fd01bbe..a74798b 100644
--- a/lib/aliases.gperf
+++ b/lib/aliases.gperf
@@ -151,11 +151,14 @@
 ISO_8859-15, ei_iso8859_15
 ISO_8859-15:1998, ei_iso8859_15
 ISO-IR-203, ei_iso8859_15
+LATIN-9, ei_iso8859_15
 ISO8859-15, ei_iso8859_15
 ISO-8859-16, ei_iso8859_16
 ISO_8859-16, ei_iso8859_16
-ISO_8859-16:2000, ei_iso8859_16
+ISO_8859-16:2001, ei_iso8859_16
 ISO-IR-226, ei_iso8859_16
+LATIN10, ei_iso8859_16
+L10, ei_iso8859_16
 ISO8859-16, ei_iso8859_16
 KOI8-R, ei_koi8_r
 CSKOI8R, ei_koi8_r
@@ -304,6 +307,8 @@
 CSGB2312, ei_euc_cn
 GBK, ei_ces_gbk
 CP936, ei_ces_gbk
+MS936, ei_ces_gbk
+WINDOWS-936, ei_ces_gbk
 GB18030, ei_gb18030
 ISO-2022-CN, ei_iso2022_cn
 CSISO2022CN, ei_iso2022_cn
diff --git a/lib/aliases.h b/lib/aliases.h
index 892a942..41ab724 100644
--- a/lib/aliases.h
+++ b/lib/aliases.h
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0 */
+/* ANSI-C code produced by gperf version 3.0.1 */
 /* Command-line: gperf -m 10 lib/aliases.gperf  */
 /* Computed positions: -k'1,3-11,$' */
 
@@ -32,12 +32,12 @@
 #line 1 "lib/aliases.gperf"
 struct alias { int name; unsigned int encoding_index; };
 
-#define TOTAL_KEYWORDS 324
+#define TOTAL_KEYWORDS 329
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 45
-#define MIN_HASH_VALUE 15
-#define MAX_HASH_VALUE 879
-/* maximum key range = 865, duplicates = 0 */
+#define MIN_HASH_VALUE 11
+#define MAX_HASH_VALUE 849
+/* maximum key range = 839, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -51,19 +51,19 @@
 {
   static const unsigned short asso_values[] =
     {
-      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
-      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
-      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
-      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
-      880, 880, 880, 880, 880,   6,  69, 880,  44,   5,
-        6,  18,  60,   9,   8,  50,  14,  13, 271, 880,
-      880, 880, 880, 880, 880, 107, 152,   5,  29,   7,
-       43, 112,  42,   5, 341, 106,  10, 158,   8,   5,
-        6, 880,  61,  38,  98, 152, 194, 112,  30,  10,
-        6, 880, 880, 880, 880,  60, 880, 880, 880, 880,
-      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
-      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
-      880, 880, 880, 880, 880, 880, 880, 880
+      850, 850, 850, 850, 850, 850, 850, 850, 850, 850,
+      850, 850, 850, 850, 850, 850, 850, 850, 850, 850,
+      850, 850, 850, 850, 850, 850, 850, 850, 850, 850,
+      850, 850, 850, 850, 850, 850, 850, 850, 850, 850,
+      850, 850, 850, 850, 850,  12,  99, 850,  41,   2,
+        7,   6,  56,   4,   3,  74,   8,  17, 181, 850,
+      850, 850, 850, 850, 850,  18, 172,   5,  18,  59,
+      123,  45, 100,   2, 227, 205, 135, 173,   4,   2,
+       20, 850,   5,  58,  20, 143, 324, 131, 164,  13,
+        5, 850, 850, 850, 850,  49, 850, 850, 850, 850,
+      850, 850, 850, 850, 850, 850, 850, 850, 850, 850,
+      850, 850, 850, 850, 850, 850, 850, 850, 850, 850,
+      850, 850, 850, 850, 850, 850, 850, 850
     };
   register int hval = len;
 
@@ -106,1479 +106,1495 @@
 
 struct stringpool_t
   {
-    char stringpool_str15[sizeof("CN")];
-    char stringpool_str17[sizeof("L1")];
-    char stringpool_str18[sizeof("L2")];
-    char stringpool_str20[sizeof("L6")];
-    char stringpool_str21[sizeof("L5")];
-    char stringpool_str26[sizeof("L8")];
-    char stringpool_str29[sizeof("862")];
-    char stringpool_str30[sizeof("L3")];
-    char stringpool_str33[sizeof("866")];
-    char stringpool_str34[sizeof("C99")];
-    char stringpool_str38[sizeof("EUCCN")];
-    char stringpool_str41[sizeof("CP1251")];
-    char stringpool_str43[sizeof("CP1252")];
-    char stringpool_str44[sizeof("CP862")];
-    char stringpool_str45[sizeof("EUC-CN")];
-    char stringpool_str47[sizeof("CP1256")];
-    char stringpool_str48[sizeof("CP866")];
-    char stringpool_str49[sizeof("CP1255")];
-    char stringpool_str50[sizeof("HZ")];
-    char stringpool_str52[sizeof("CP1361")];
-    char stringpool_str53[sizeof("CP932")];
-    char stringpool_str55[sizeof("CP819")];
-    char stringpool_str57[sizeof("CP936")];
-    char stringpool_str58[sizeof("X0212")];
-    char stringpool_str59[sizeof("CP1258")];
-    char stringpool_str62[sizeof("L7")];
-    char stringpool_str67[sizeof("CP1253")];
-    char stringpool_str72[sizeof("L4")];
-    char stringpool_str75[sizeof("CP1133")];
-    char stringpool_str77[sizeof("R8")];
-    char stringpool_str84[sizeof("CHINESE")];
-    char stringpool_str85[sizeof("ISO8859-1")];
-    char stringpool_str87[sizeof("ISO8859-2")];
-    char stringpool_str91[sizeof("ISO8859-6")];
-    char stringpool_str92[sizeof("ISO-8859-1")];
-    char stringpool_str93[sizeof("ISO8859-5")];
-    char stringpool_str94[sizeof("ISO-8859-2")];
-    char stringpool_str95[sizeof("X0201")];
-    char stringpool_str97[sizeof("ISO8859-16")];
-    char stringpool_str98[sizeof("ISO-8859-6")];
-    char stringpool_str99[sizeof("ISO8859-15")];
-    char stringpool_str100[sizeof("ISO-8859-5")];
-    char stringpool_str101[sizeof("ISO8859-9")];
-    char stringpool_str103[sizeof("ISO8859-8")];
-    char stringpool_str104[sizeof("ISO-8859-16")];
-    char stringpool_str105[sizeof("850")];
-    char stringpool_str106[sizeof("ISO-8859-15")];
-    char stringpool_str108[sizeof("ISO-8859-9")];
-    char stringpool_str109[sizeof("CP949")];
-    char stringpool_str110[sizeof("ISO-8859-8")];
-    char stringpool_str111[sizeof("ISO8859-3")];
-    char stringpool_str112[sizeof("ISO-IR-6")];
-    char stringpool_str113[sizeof("X0208")];
-    char stringpool_str114[sizeof("CYRILLIC")];
-    char stringpool_str116[sizeof("ISO-2022-CN")];
-    char stringpool_str117[sizeof("ISO8859-13")];
-    char stringpool_str118[sizeof("ISO-8859-3")];
-    char stringpool_str119[sizeof("CP1250")];
-    char stringpool_str120[sizeof("CP950")];
-    char stringpool_str121[sizeof("CP850")];
-    char stringpool_str122[sizeof("ISO646-CN")];
-    char stringpool_str123[sizeof("SJIS")];
-    char stringpool_str124[sizeof("ISO-8859-13")];
-    char stringpool_str125[sizeof("ISO-IR-126")];
-    char stringpool_str126[sizeof("ISO-IR-226")];
-    char stringpool_str127[sizeof("ISO-IR-166")];
-    char stringpool_str129[sizeof("ISO-IR-165")];
-    char stringpool_str131[sizeof("CP1257")];
-    char stringpool_str132[sizeof("ASCII")];
-    char stringpool_str134[sizeof("ISO-IR-58")];
-    char stringpool_str136[sizeof("CP367")];
-    char stringpool_str137[sizeof("LATIN1")];
-    char stringpool_str138[sizeof("ISO-IR-159")];
-    char stringpool_str139[sizeof("LATIN2")];
-    char stringpool_str142[sizeof("ISO-IR-199")];
-    char stringpool_str143[sizeof("LATIN6")];
-    char stringpool_str145[sizeof("LATIN5")];
-    char stringpool_str146[sizeof("ISO_8859-1")];
-    char stringpool_str147[sizeof("CSISO2022CN")];
-    char stringpool_str148[sizeof("ISO_8859-2")];
-    char stringpool_str149[sizeof("ISO-IR-138")];
-    char stringpool_str151[sizeof("CP1254")];
-    char stringpool_str152[sizeof("ISO_8859-6")];
-    char stringpool_str154[sizeof("ISO_8859-5")];
-    char stringpool_str155[sizeof("LATIN8")];
-    char stringpool_str157[sizeof("ISO-IR-101")];
-    char stringpool_str158[sizeof("ISO_8859-16")];
-    char stringpool_str159[sizeof("GB2312")];
-    char stringpool_str160[sizeof("ISO_8859-15")];
-    char stringpool_str161[sizeof("ISO-CELTIC")];
-    char stringpool_str162[sizeof("ISO_8859-9")];
-    char stringpool_str163[sizeof("LATIN3")];
-    char stringpool_str164[sizeof("ISO_8859-8")];
-    char stringpool_str165[sizeof("UHC")];
-    char stringpool_str169[sizeof("ISO8859-10")];
-    char stringpool_str170[sizeof("ISO_8859-15:1998")];
-    char stringpool_str171[sizeof("MAC")];
-    char stringpool_str172[sizeof("ISO_8859-3")];
-    char stringpool_str173[sizeof("ISO-IR-109")];
-    char stringpool_str175[sizeof("ISO8859-7")];
-    char stringpool_str176[sizeof("ISO-8859-10")];
-    char stringpool_str177[sizeof("CSASCII")];
-    char stringpool_str178[sizeof("ISO_8859-13")];
-    char stringpool_str179[sizeof("ISO-IR-179")];
-    char stringpool_str182[sizeof("ISO-8859-7")];
-    char stringpool_str184[sizeof("ISO-IR-203")];
-    char stringpool_str189[sizeof("ISO-IR-149")];
-    char stringpool_str190[sizeof("MS-EE")];
-    char stringpool_str191[sizeof("ISO-IR-148")];
-    char stringpool_str192[sizeof("US")];
-    char stringpool_str194[sizeof("CP874")];
-    char stringpool_str195[sizeof("ISO8859-4")];
-    char stringpool_str196[sizeof("ISO-IR-110")];
-    char stringpool_str197[sizeof("ISO_8859-10:1992")];
-    char stringpool_str199[sizeof("ISO_8859-16:2000")];
-    char stringpool_str201[sizeof("ISO8859-14")];
-    char stringpool_str202[sizeof("ISO-8859-4")];
-    char stringpool_str203[sizeof("IBM862")];
-    char stringpool_str206[sizeof("ISO-IR-57")];
-    char stringpool_str207[sizeof("IBM866")];
-    char stringpool_str208[sizeof("ISO-8859-14")];
-    char stringpool_str209[sizeof("ISO-IR-127")];
-    char stringpool_str210[sizeof("ISO-2022-CN-EXT")];
-    char stringpool_str211[sizeof("ISO-IR-87")];
-    char stringpool_str212[sizeof("ISO-IR-157")];
-    char stringpool_str213[sizeof("UCS-2")];
-    char stringpool_str214[sizeof("IBM819")];
-    char stringpool_str221[sizeof("ISO_8859-14:1998")];
-    char stringpool_str222[sizeof("ISO-IR-14")];
-    char stringpool_str225[sizeof("ELOT_928")];
-    char stringpool_str227[sizeof("LATIN7")];
-    char stringpool_str228[sizeof("UTF-16")];
-    char stringpool_str230[sizeof("ISO_8859-10")];
-    char stringpool_str232[sizeof("CSUNICODE")];
-    char stringpool_str233[sizeof("UCS-2LE")];
-    char stringpool_str234[sizeof("UTF-8")];
-    char stringpool_str235[sizeof("ISO-IR-100")];
-    char stringpool_str236[sizeof("ISO_8859-7")];
-    char stringpool_str237[sizeof("UTF-32")];
-    char stringpool_str238[sizeof("CHAR")];
-    char stringpool_str241[sizeof("UNICODE-1-1")];
-    char stringpool_str242[sizeof("CSUNICODE11")];
-    char stringpool_str244[sizeof("TIS620")];
-    char stringpool_str245[sizeof("EUCKR")];
-    char stringpool_str246[sizeof("UTF-16LE")];
-    char stringpool_str247[sizeof("LATIN4")];
-    char stringpool_str250[sizeof("KSC_5601")];
-    char stringpool_str251[sizeof("TIS-620")];
-    char stringpool_str252[sizeof("EUC-KR")];
-    char stringpool_str254[sizeof("IBM-CP1133")];
-    char stringpool_str256[sizeof("ISO_8859-4")];
-    char stringpool_str257[sizeof("UTF-32LE")];
-    char stringpool_str258[sizeof("VISCII")];
-    char stringpool_str259[sizeof("KOI8-R")];
-    char stringpool_str262[sizeof("ISO_8859-14")];
-    char stringpool_str264[sizeof("CSKOI8R")];
-    char stringpool_str266[sizeof("GREEK8")];
-    char stringpool_str267[sizeof("MS-CYRL")];
-    char stringpool_str270[sizeof("CSVISCII")];
-    char stringpool_str280[sizeof("IBM850")];
-    char stringpool_str283[sizeof("ISO-IR-144")];
-    char stringpool_str286[sizeof("BIG5")];
-    char stringpool_str287[sizeof("UCS-4LE")];
-    char stringpool_str288[sizeof("GB18030")];
-    char stringpool_str290[sizeof("MACCYRILLIC")];
-    char stringpool_str291[sizeof("CSUNICODE11UTF7")];
-    char stringpool_str292[sizeof("UNICODE-1-1-UTF-7")];
-    char stringpool_str293[sizeof("BIG-5")];
-    char stringpool_str295[sizeof("IBM367")];
-    char stringpool_str296[sizeof("TIS620-0")];
-    char stringpool_str298[sizeof("CSBIG5")];
-    char stringpool_str299[sizeof("NEXTSTEP")];
-    char stringpool_str301[sizeof("CSKSC56011987")];
-    char stringpool_str302[sizeof("CSISOLATIN1")];
-    char stringpool_str303[sizeof("KOREAN")];
-    char stringpool_str304[sizeof("CSISOLATIN2")];
-    char stringpool_str305[sizeof("CN-BIG5")];
-    char stringpool_str306[sizeof("UTF-7")];
-    char stringpool_str308[sizeof("CSISOLATIN6")];
-    char stringpool_str309[sizeof("CSISOLATINCYRILLIC")];
-    char stringpool_str310[sizeof("CSISOLATIN5")];
-    char stringpool_str312[sizeof("TCVN")];
-    char stringpool_str315[sizeof("TIS620.2529-1")];
-    char stringpool_str318[sizeof("CSGB2312")];
-    char stringpool_str320[sizeof("ISO-10646-UCS-2")];
-    char stringpool_str321[sizeof("UCS-4")];
-    char stringpool_str322[sizeof("MULELAO-1")];
-    char stringpool_str323[sizeof("ISO-2022-KR")];
-    char stringpool_str324[sizeof("ECMA-118")];
-    char stringpool_str325[sizeof("GB_2312-80")];
-    char stringpool_str326[sizeof("CSUCS4")];
-    char stringpool_str327[sizeof("GBK")];
-    char stringpool_str328[sizeof("CSISOLATIN3")];
-    char stringpool_str329[sizeof("ISO646-US")];
-    char stringpool_str331[sizeof("US-ASCII")];
-    char stringpool_str332[sizeof("TIS620.2533-1")];
-    char stringpool_str333[sizeof("KOI8-T")];
-    char stringpool_str334[sizeof("MS-ANSI")];
-    char stringpool_str335[sizeof("KS_C_5601-1989")];
-    char stringpool_str336[sizeof("GB_1988-80")];
-    char stringpool_str339[sizeof("EUCTW")];
-    char stringpool_str343[sizeof("GREEK")];
-    char stringpool_str346[sizeof("EUC-TW")];
-    char stringpool_str347[sizeof("WINDOWS-1251")];
-    char stringpool_str348[sizeof("WINDOWS-1252")];
-    char stringpool_str349[sizeof("JP")];
-    char stringpool_str350[sizeof("WINDOWS-1256")];
-    char stringpool_str351[sizeof("WINDOWS-1255")];
-    char stringpool_str353[sizeof("VISCII1.1-1")];
-    char stringpool_str354[sizeof("CSISO2022KR")];
-    char stringpool_str356[sizeof("WINDOWS-1258")];
-    char stringpool_str360[sizeof("WINDOWS-1253")];
-    char stringpool_str361[sizeof("ARMSCII-8")];
-    char stringpool_str366[sizeof("CSIBM866")];
-    char stringpool_str368[sizeof("ROMAN8")];
-    char stringpool_str369[sizeof("HZ-GB-2312")];
-    char stringpool_str370[sizeof("EUCJP")];
-    char stringpool_str371[sizeof("TIS620.2533-0")];
-    char stringpool_str372[sizeof("KS_C_5601-1987")];
-    char stringpool_str373[sizeof("MACICELAND")];
-    char stringpool_str374[sizeof("ISO-10646-UCS-4")];
-    char stringpool_str375[sizeof("UCS-2BE")];
-    char stringpool_str377[sizeof("EUC-JP")];
-    char stringpool_str386[sizeof("WINDOWS-1250")];
-    char stringpool_str387[sizeof("ARABIC")];
-    char stringpool_str388[sizeof("UTF-16BE")];
-    char stringpool_str391[sizeof("TCVN-5712")];
-    char stringpool_str392[sizeof("WINDOWS-1257")];
-    char stringpool_str394[sizeof("CSPC862LATINHEBREW")];
-    char stringpool_str396[sizeof("TCVN5712-1")];
-    char stringpool_str399[sizeof("UTF-32BE")];
-    char stringpool_str402[sizeof("WINDOWS-1254")];
-    char stringpool_str404[sizeof("CSEUCKR")];
-    char stringpool_str406[sizeof("ASMO-708")];
-    char stringpool_str409[sizeof("CSISOLATINARABIC")];
-    char stringpool_str410[sizeof("MACINTOSH")];
-    char stringpool_str411[sizeof("UCS-2-INTERNAL")];
-    char stringpool_str412[sizeof("CSISOLATIN4")];
-    char stringpool_str416[sizeof("ECMA-114")];
-    char stringpool_str418[sizeof("CN-GB-ISOIR165")];
-    char stringpool_str420[sizeof("ANSI_X3.4-1986")];
-    char stringpool_str421[sizeof("CSISO57GB1988")];
-    char stringpool_str423[sizeof("CSISO58GB231280")];
-    char stringpool_str424[sizeof("HP-ROMAN8")];
-    char stringpool_str426[sizeof("ANSI_X3.4-1968")];
-    char stringpool_str427[sizeof("MACTHAI")];
-    char stringpool_str429[sizeof("UCS-4BE")];
-    char stringpool_str430[sizeof("CSHPROMAN8")];
-    char stringpool_str432[sizeof("CN-GB")];
-    char stringpool_str434[sizeof("UNICODELITTLE")];
-    char stringpool_str435[sizeof("ISO_8859-5:1988")];
-    char stringpool_str438[sizeof("ISO_8859-9:1989")];
-    char stringpool_str440[sizeof("ISO_8859-8:1988")];
-    char stringpool_str441[sizeof("KOI8-U")];
-    char stringpool_str444[sizeof("ISO_8859-3:1988")];
-    char stringpool_str448[sizeof("ISO-2022-JP")];
-    char stringpool_str449[sizeof("ISO-2022-JP-1")];
-    char stringpool_str450[sizeof("ISO-2022-JP-2")];
-    char stringpool_str451[sizeof("CSISOLATINHEBREW")];
-    char stringpool_str454[sizeof("ISO646-JP")];
-    char stringpool_str457[sizeof("EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE")];
-    char stringpool_str465[sizeof("UCS-4-INTERNAL")];
-    char stringpool_str467[sizeof("ISO_8859-1:1987")];
-    char stringpool_str468[sizeof("ISO_8859-2:1987")];
-    char stringpool_str470[sizeof("ISO_8859-6:1987")];
-    char stringpool_str479[sizeof("CSISO2022JP")];
-    char stringpool_str480[sizeof("CSISO2022JP2")];
-    char stringpool_str486[sizeof("ISO_8859-4:1988")];
-    char stringpool_str489[sizeof("MACCENTRALEUROPE")];
-    char stringpool_str492[sizeof("HEBREW")];
-    char stringpool_str494[sizeof("MS-HEBR")];
-    char stringpool_str496[sizeof("ISO_646.IRV:1991")];
-    char stringpool_str498[sizeof("CSEUCTW")];
-    char stringpool_str503[sizeof("KOI8-RU")];
-    char stringpool_str505[sizeof("WINDOWS-874")];
-    char stringpool_str508[sizeof("JIS0208")];
-    char stringpool_str509[sizeof("GEORGIAN-PS")];
-    char stringpool_str512[sizeof("ISO_8859-7:1987")];
-    char stringpool_str514[sizeof("CSISOLATINGREEK")];
-    char stringpool_str515[sizeof("JIS_C6226-1983")];
-    char stringpool_str518[sizeof("MACROMAN")];
-    char stringpool_str519[sizeof("UCS-2-SWAPPED")];
-    char stringpool_str524[sizeof("CSMACINTOSH")];
-    char stringpool_str527[sizeof("BIGFIVE")];
-    char stringpool_str528[sizeof("CSISO159JISX02121990")];
-    char stringpool_str529[sizeof("CSISO14JISC6220RO")];
-    char stringpool_str530[sizeof("CSPC850MULTILINGUAL")];
-    char stringpool_str534[sizeof("BIG-FIVE")];
-    char stringpool_str541[sizeof("JIS_C6220-1969-RO")];
-    char stringpool_str545[sizeof("JIS_X0212")];
-    char stringpool_str549[sizeof("BIG5HKSCS")];
-    char stringpool_str553[sizeof("JISX0201-1976")];
-    char stringpool_str554[sizeof("GEORGIAN-ACADEMY")];
-    char stringpool_str556[sizeof("BIG5-HKSCS")];
-    char stringpool_str560[sizeof("CSISO87JISX0208")];
-    char stringpool_str570[sizeof("MACGREEK")];
-    char stringpool_str571[sizeof("MS-GREEK")];
-    char stringpool_str573[sizeof("UCS-4-SWAPPED")];
-    char stringpool_str578[sizeof("MACCROATIAN")];
-    char stringpool_str582[sizeof("JIS_X0201")];
-    char stringpool_str585[sizeof("WCHAR_T")];
-    char stringpool_str594[sizeof("UNICODEBIG")];
-    char stringpool_str599[sizeof("JIS_X0212-1990")];
-    char stringpool_str600[sizeof("JIS_X0208")];
-    char stringpool_str614[sizeof("MACARABIC")];
-    char stringpool_str619[sizeof("CSHALFWIDTHKATAKANA")];
-    char stringpool_str620[sizeof("JIS_X0208-1983")];
-    char stringpool_str621[sizeof("SHIFT-JIS")];
-    char stringpool_str626[sizeof("MACUKRAINE")];
-    char stringpool_str635[sizeof("CSEUCPKDFMTJAPANESE")];
-    char stringpool_str646[sizeof("JIS_X0208-1990")];
+    char stringpool_str11[sizeof("CN")];
+    char stringpool_str15[sizeof("R8")];
+    char stringpool_str17[sizeof("866")];
+    char stringpool_str25[sizeof("862")];
+    char stringpool_str26[sizeof("CP1361")];
+    char stringpool_str27[sizeof("CP866")];
+    char stringpool_str28[sizeof("CP1251")];
+    char stringpool_str30[sizeof("CP1256")];
+    char stringpool_str32[sizeof("CP1255")];
+    char stringpool_str33[sizeof("CP1133")];
+    char stringpool_str34[sizeof("ASCII")];
+    char stringpool_str35[sizeof("CP862")];
+    char stringpool_str36[sizeof("CP1253")];
+    char stringpool_str37[sizeof("CHAR")];
+    char stringpool_str38[sizeof("CP1252")];
+    char stringpool_str39[sizeof("CP936")];
+    char stringpool_str40[sizeof("CP1258")];
+    char stringpool_str42[sizeof("C99")];
+    char stringpool_str47[sizeof("CP932")];
+    char stringpool_str49[sizeof("ISO-IR-6")];
+    char stringpool_str54[sizeof("CP819")];
+    char stringpool_str56[sizeof("ISO-IR-166")];
+    char stringpool_str58[sizeof("ISO-IR-165")];
+    char stringpool_str60[sizeof("ISO-IR-126")];
+    char stringpool_str64[sizeof("ISO-IR-58")];
+    char stringpool_str65[sizeof("ISO-IR-226")];
+    char stringpool_str66[sizeof("ISO8859-1")];
+    char stringpool_str68[sizeof("ISO8859-6")];
+    char stringpool_str69[sizeof("ISO-IR-138")];
+    char stringpool_str70[sizeof("ISO8859-5")];
+    char stringpool_str71[sizeof("ISO8859-16")];
+    char stringpool_str73[sizeof("ISO8859-15")];
+    char stringpool_str74[sizeof("ISO8859-3")];
+    char stringpool_str76[sizeof("ISO8859-2")];
+    char stringpool_str77[sizeof("ISO8859-13")];
+    char stringpool_str78[sizeof("ISO8859-8")];
+    char stringpool_str79[sizeof("ISO-8859-1")];
+    char stringpool_str80[sizeof("GB2312")];
+    char stringpool_str81[sizeof("ISO-8859-6")];
+    char stringpool_str82[sizeof("EUCCN")];
+    char stringpool_str83[sizeof("ISO-8859-5")];
+    char stringpool_str84[sizeof("ISO-8859-16")];
+    char stringpool_str85[sizeof("ISO-IR-159")];
+    char stringpool_str86[sizeof("ISO-8859-15")];
+    char stringpool_str87[sizeof("ISO-8859-3")];
+    char stringpool_str89[sizeof("ISO-8859-2")];
+    char stringpool_str90[sizeof("ISO-8859-13")];
+    char stringpool_str91[sizeof("ISO-8859-8")];
+    char stringpool_str92[sizeof("ISO-IR-101")];
+    char stringpool_str93[sizeof("850")];
+    char stringpool_str95[sizeof("EUC-CN")];
+    char stringpool_str96[sizeof("ISO8859-9")];
+    char stringpool_str98[sizeof("ISO-IR-199")];
+    char stringpool_str99[sizeof("CSASCII")];
+    char stringpool_str100[sizeof("ISO646-CN")];
+    char stringpool_str104[sizeof("CP850")];
+    char stringpool_str105[sizeof("ISO-IR-203")];
+    char stringpool_str106[sizeof("CP1250")];
+    char stringpool_str107[sizeof("HZ")];
+    char stringpool_str109[sizeof("ISO-8859-9")];
+    char stringpool_str113[sizeof("CP950")];
+    char stringpool_str114[sizeof("ISO-2022-CN")];
+    char stringpool_str116[sizeof("ISO_8859-1")];
+    char stringpool_str117[sizeof("CP949")];
+    char stringpool_str118[sizeof("ISO_8859-6")];
+    char stringpool_str119[sizeof("ISO-IR-148")];
+    char stringpool_str120[sizeof("ISO_8859-5")];
+    char stringpool_str121[sizeof("ISO_8859-16")];
+    char stringpool_str122[sizeof("ISO-IR-109")];
+    char stringpool_str123[sizeof("ISO_8859-15")];
+    char stringpool_str124[sizeof("ISO_8859-3")];
+    char stringpool_str125[sizeof("ISO_8859-16:2001")];
+    char stringpool_str126[sizeof("ISO_8859-2")];
+    char stringpool_str127[sizeof("ISO_8859-13")];
+    char stringpool_str128[sizeof("ISO_8859-8")];
+    char stringpool_str131[sizeof("ISO-IR-110")];
+    char stringpool_str132[sizeof("ISO_8859-15:1998")];
+    char stringpool_str134[sizeof("ISO-2022-CN-EXT")];
+    char stringpool_str136[sizeof("CP1254")];
+    char stringpool_str137[sizeof("ISO-IR-149")];
+    char stringpool_str139[sizeof("L1")];
+    char stringpool_str140[sizeof("L6")];
+    char stringpool_str141[sizeof("L5")];
+    char stringpool_str143[sizeof("L3")];
+    char stringpool_str144[sizeof("L2")];
+    char stringpool_str145[sizeof("L8")];
+    char stringpool_str146[sizeof("ISO_8859-9")];
+    char stringpool_str147[sizeof("ISO8859-10")];
+    char stringpool_str153[sizeof("CSISO2022CN")];
+    char stringpool_str155[sizeof("ISO-IR-179")];
+    char stringpool_str156[sizeof("UHC")];
+    char stringpool_str158[sizeof("ISO-IR-14")];
+    char stringpool_str160[sizeof("ISO-8859-10")];
+    char stringpool_str167[sizeof("CP367")];
+    char stringpool_str168[sizeof("ISO_8859-10:1992")];
+    char stringpool_str170[sizeof("ISO-IR-100")];
+    char stringpool_str171[sizeof("LATIN1")];
+    char stringpool_str172[sizeof("CP1257")];
+    char stringpool_str173[sizeof("LATIN6")];
+    char stringpool_str174[sizeof("ISO8859-4")];
+    char stringpool_str175[sizeof("LATIN5")];
+    char stringpool_str176[sizeof("TIS620")];
+    char stringpool_str177[sizeof("ISO8859-14")];
+    char stringpool_str178[sizeof("ELOT_928")];
+    char stringpool_str179[sizeof("LATIN3")];
+    char stringpool_str180[sizeof("SJIS")];
+    char stringpool_str181[sizeof("LATIN2")];
+    char stringpool_str183[sizeof("LATIN8")];
+    char stringpool_str184[sizeof("ISO_8859-14:1998")];
+    char stringpool_str185[sizeof("GEORGIAN-ACADEMY")];
+    char stringpool_str186[sizeof("MAC")];
+    char stringpool_str187[sizeof("ISO-8859-4")];
+    char stringpool_str189[sizeof("TIS-620")];
+    char stringpool_str190[sizeof("ISO-8859-14")];
+    char stringpool_str191[sizeof("GB18030")];
+    char stringpool_str192[sizeof("X0212")];
+    char stringpool_str193[sizeof("L4")];
+    char stringpool_str196[sizeof("ISO-IR-57")];
+    char stringpool_str197[sizeof("ISO_8859-10")];
+    char stringpool_str198[sizeof("IBM866")];
+    char stringpool_str199[sizeof("ISO-IR-157")];
+    char stringpool_str200[sizeof("ISO-IR-87")];
+    char stringpool_str202[sizeof("ISO-IR-127")];
+    char stringpool_str203[sizeof("US")];
+    char stringpool_str204[sizeof("CP874")];
+    char stringpool_str206[sizeof("IBM862")];
+    char stringpool_str207[sizeof("MS936")];
+    char stringpool_str210[sizeof("ISO8859-7")];
+    char stringpool_str211[sizeof("L7")];
+    char stringpool_str214[sizeof("LATIN-9")];
+    char stringpool_str215[sizeof("ISO-IR-144")];
+    char stringpool_str220[sizeof("L10")];
+    char stringpool_str221[sizeof("X0201")];
+    char stringpool_str222[sizeof("ROMAN8")];
+    char stringpool_str223[sizeof("ISO-8859-7")];
+    char stringpool_str224[sizeof("ISO_8859-4")];
+    char stringpool_str225[sizeof("IBM819")];
+    char stringpool_str226[sizeof("ARABIC")];
+    char stringpool_str227[sizeof("ISO_8859-14")];
+    char stringpool_str228[sizeof("GB_2312-80")];
+    char stringpool_str229[sizeof("BIG5")];
+    char stringpool_str231[sizeof("TIS620-0")];
+    char stringpool_str232[sizeof("UCS-2")];
+    char stringpool_str233[sizeof("X0208")];
+    char stringpool_str238[sizeof("CSBIG5")];
+    char stringpool_str239[sizeof("CSKOI8R")];
+    char stringpool_str241[sizeof("GB_1988-80")];
+    char stringpool_str242[sizeof("BIG-5")];
+    char stringpool_str243[sizeof("KOI8-R")];
+    char stringpool_str244[sizeof("IBM-CP1133")];
+    char stringpool_str249[sizeof("JP")];
+    char stringpool_str250[sizeof("US-ASCII")];
+    char stringpool_str251[sizeof("CN-BIG5")];
+    char stringpool_str252[sizeof("LATIN10")];
+    char stringpool_str253[sizeof("CHINESE")];
+    char stringpool_str255[sizeof("CSUNICODE11")];
+    char stringpool_str257[sizeof("ISO-CELTIC")];
+    char stringpool_str259[sizeof("CSGB2312")];
+    char stringpool_str260[sizeof("ISO_8859-7")];
+    char stringpool_str261[sizeof("CSISOLATIN1")];
+    char stringpool_str263[sizeof("CSISOLATIN6")];
+    char stringpool_str265[sizeof("CSISOLATIN5")];
+    char stringpool_str266[sizeof("TIS620.2533-1")];
+    char stringpool_str267[sizeof("MACCROATIAN")];
+    char stringpool_str269[sizeof("CSISOLATIN3")];
+    char stringpool_str270[sizeof("UNICODE-1-1")];
+    char stringpool_str271[sizeof("CSISOLATIN2")];
+    char stringpool_str273[sizeof("KOI8-T")];
+    char stringpool_str274[sizeof("CSISOLATINCYRILLIC")];
+    char stringpool_str275[sizeof("IBM850")];
+    char stringpool_str276[sizeof("MS-ANSI")];
+    char stringpool_str278[sizeof("TIS620.2529-1")];
+    char stringpool_str279[sizeof("LATIN4")];
+    char stringpool_str280[sizeof("GEORGIAN-PS")];
+    char stringpool_str284[sizeof("EUCKR")];
+    char stringpool_str285[sizeof("CSISOLATINARABIC")];
+    char stringpool_str290[sizeof("ECMA-118")];
+    char stringpool_str292[sizeof("UTF-16")];
+    char stringpool_str295[sizeof("ARMSCII-8")];
+    char stringpool_str297[sizeof("EUC-KR")];
+    char stringpool_str298[sizeof("ISO-10646-UCS-2")];
+    char stringpool_str299[sizeof("UTF-8")];
+    char stringpool_str301[sizeof("KOREAN")];
+    char stringpool_str302[sizeof("CYRILLIC")];
+    char stringpool_str304[sizeof("UTF-32")];
+    char stringpool_str305[sizeof("TIS620.2533-0")];
+    char stringpool_str306[sizeof("CSUNICODE")];
+    char stringpool_str310[sizeof("ISO_8859-5:1988")];
+    char stringpool_str312[sizeof("ISO_8859-3:1988")];
+    char stringpool_str314[sizeof("ISO_8859-8:1988")];
+    char stringpool_str315[sizeof("LATIN7")];
+    char stringpool_str316[sizeof("ISO-2022-KR")];
+    char stringpool_str319[sizeof("KSC_5601")];
+    char stringpool_str327[sizeof("MACTHAI")];
+    char stringpool_str329[sizeof("CSUCS4")];
+    char stringpool_str330[sizeof("UCS-4")];
+    char stringpool_str331[sizeof("CSUNICODE11UTF7")];
+    char stringpool_str332[sizeof("ISO_8859-9:1989")];
+    char stringpool_str333[sizeof("CN-GB-ISOIR165")];
+    char stringpool_str336[sizeof("EUCJP")];
+    char stringpool_str338[sizeof("IBM367")];
+    char stringpool_str339[sizeof("HP-ROMAN8")];
+    char stringpool_str344[sizeof("ASMO-708")];
+    char stringpool_str346[sizeof("ISO646-US")];
+    char stringpool_str347[sizeof("ISO-10646-UCS-4")];
+    char stringpool_str348[sizeof("UNICODE-1-1-UTF-7")];
+    char stringpool_str349[sizeof("EUC-JP")];
+    char stringpool_str350[sizeof("WCHAR_T")];
+    char stringpool_str351[sizeof("EUCTW")];
+    char stringpool_str352[sizeof("ISO-2022-JP-1")];
+    char stringpool_str353[sizeof("CSHPROMAN8")];
+    char stringpool_str354[sizeof("ISO646-JP")];
+    char stringpool_str355[sizeof("CSISO2022KR")];
+    char stringpool_str356[sizeof("TCVN")];
+    char stringpool_str357[sizeof("ISO-2022-JP-2")];
+    char stringpool_str362[sizeof("ISO_8859-4:1988")];
+    char stringpool_str364[sizeof("EUC-TW")];
+    char stringpool_str365[sizeof("CSISO58GB231280")];
+    char stringpool_str367[sizeof("MS-EE")];
+    char stringpool_str368[sizeof("ISO-2022-JP")];
+    char stringpool_str369[sizeof("CSISOLATIN4")];
+    char stringpool_str372[sizeof("CSPC862LATINHEBREW")];
+    char stringpool_str373[sizeof("NEXTSTEP")];
+    char stringpool_str374[sizeof("ISO_8859-1:1987")];
+    char stringpool_str375[sizeof("ISO_8859-6:1987")];
+    char stringpool_str377[sizeof("CSIBM866")];
+    char stringpool_str379[sizeof("ISO_8859-2:1987")];
+    char stringpool_str380[sizeof("HZ-GB-2312")];
+    char stringpool_str383[sizeof("WINDOWS-1251")];
+    char stringpool_str384[sizeof("WINDOWS-1256")];
+    char stringpool_str385[sizeof("WINDOWS-1255")];
+    char stringpool_str386[sizeof("ECMA-114")];
+    char stringpool_str387[sizeof("WINDOWS-1253")];
+    char stringpool_str388[sizeof("WINDOWS-1252")];
+    char stringpool_str389[sizeof("WINDOWS-1258")];
+    char stringpool_str390[sizeof("GREEK8")];
+    char stringpool_str392[sizeof("MACROMAN")];
+    char stringpool_str393[sizeof("JIS_C6226-1983")];
+    char stringpool_str395[sizeof("CSISO2022JP2")];
+    char stringpool_str396[sizeof("WINDOWS-936")];
+    char stringpool_str397[sizeof("JIS0208")];
+    char stringpool_str399[sizeof("VISCII")];
+    char stringpool_str402[sizeof("CSISO57GB1988")];
+    char stringpool_str403[sizeof("KS_C_5601-1989")];
+    char stringpool_str407[sizeof("CSISO2022JP")];
+    char stringpool_str408[sizeof("CSVISCII")];
+    char stringpool_str411[sizeof("CN-GB")];
+    char stringpool_str412[sizeof("MACARABIC")];
+    char stringpool_str422[sizeof("WINDOWS-1250")];
+    char stringpool_str428[sizeof("MACROMANIA")];
+    char stringpool_str429[sizeof("CSKSC56011987")];
+    char stringpool_str430[sizeof("JIS_C6220-1969-RO")];
+    char stringpool_str431[sizeof("UTF-7")];
+    char stringpool_str434[sizeof("CSEUCKR")];
+    char stringpool_str436[sizeof("CSISO14JISC6220RO")];
+    char stringpool_str437[sizeof("WINDOWS-1254")];
+    char stringpool_str438[sizeof("CSISO159JISX02121990")];
+    char stringpool_str446[sizeof("ISO_8859-7:1987")];
+    char stringpool_str447[sizeof("MACICELAND")];
+    char stringpool_str455[sizeof("WINDOWS-1257")];
+    char stringpool_str458[sizeof("GBK")];
+    char stringpool_str460[sizeof("KS_C_5601-1987")];
+    char stringpool_str461[sizeof("TCVN5712-1")];
+    char stringpool_str463[sizeof("TCVN-5712")];
+    char stringpool_str471[sizeof("UCS-2-INTERNAL")];
+    char stringpool_str473[sizeof("MACINTOSH")];
+    char stringpool_str478[sizeof("UNICODELITTLE")];
+    char stringpool_str480[sizeof("UCS-2LE")];
+    char stringpool_str483[sizeof("ANSI_X3.4-1986")];
+    char stringpool_str485[sizeof("MS-CYRL")];
+    char stringpool_str488[sizeof("ANSI_X3.4-1968")];
+    char stringpool_str493[sizeof("CSISOLATINHEBREW")];
+    char stringpool_str496[sizeof("MACCYRILLIC")];
+    char stringpool_str498[sizeof("CSMACINTOSH")];
+    char stringpool_str501[sizeof("CSEUCTW")];
+    char stringpool_str503[sizeof("UNICODEBIG")];
+    char stringpool_str510[sizeof("UCS-2-SWAPPED")];
+    char stringpool_str511[sizeof("CSISOLATINGREEK")];
+    char stringpool_str517[sizeof("UCS-2BE")];
+    char stringpool_str519[sizeof("KOI8-U")];
+    char stringpool_str520[sizeof("UCS-4-INTERNAL")];
+    char stringpool_str521[sizeof("VISCII1.1-1")];
+    char stringpool_str525[sizeof("KOI8-RU")];
+    char stringpool_str529[sizeof("UCS-4LE")];
+    char stringpool_str533[sizeof("MS-HEBR")];
+    char stringpool_str537[sizeof("EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE")];
+    char stringpool_str544[sizeof("UTF-16LE")];
+    char stringpool_str547[sizeof("MULELAO-1")];
+    char stringpool_str552[sizeof("UTF-32LE")];
+    char stringpool_str558[sizeof("MACCENTRALEUROPE")];
+    char stringpool_str559[sizeof("UCS-4-SWAPPED")];
+    char stringpool_str561[sizeof("WINDOWS-874")];
+    char stringpool_str563[sizeof("ISO_646.IRV:1991")];
+    char stringpool_str566[sizeof("UCS-4BE")];
+    char stringpool_str569[sizeof("SHIFT-JIS")];
+    char stringpool_str571[sizeof("JIS_X0212")];
+    char stringpool_str577[sizeof("MS-ARAB")];
+    char stringpool_str578[sizeof("GREEK")];
+    char stringpool_str581[sizeof("UTF-16BE")];
+    char stringpool_str587[sizeof("JISX0201-1976")];
+    char stringpool_str589[sizeof("UTF-32BE")];
+    char stringpool_str591[sizeof("JAVA")];
+    char stringpool_str600[sizeof("JIS_X0201")];
+    char stringpool_str604[sizeof("HEBREW")];
+    char stringpool_str606[sizeof("SHIFT_JIS")];
+    char stringpool_str612[sizeof("JIS_X0208")];
+    char stringpool_str623[sizeof("CSISO87JISX0208")];
+    char stringpool_str624[sizeof("JIS_X0212-1990")];
+    char stringpool_str629[sizeof("JIS_X0208-1983")];
+    char stringpool_str651[sizeof("TCVN5712-1:1993")];
     char stringpool_str663[sizeof("CSSHIFTJIS")];
-    char stringpool_str664[sizeof("JIS_X0212.1990-0")];
-    char stringpool_str665[sizeof("MACHEBREW")];
-    char stringpool_str675[sizeof("SHIFT_JIS")];
-    char stringpool_str685[sizeof("TCVN5712-1:1993")];
-    char stringpool_str694[sizeof("MS-TURK")];
-    char stringpool_str717[sizeof("MACTURKISH")];
-    char stringpool_str731[sizeof("MACROMANIA")];
-    char stringpool_str750[sizeof("MS-ARAB")];
-    char stringpool_str753[sizeof("JAVA")];
-    char stringpool_str798[sizeof("MS_KANJI")];
-    char stringpool_str799[sizeof("JOHAB")];
-    char stringpool_str879[sizeof("WINBALTRIM")];
+    char stringpool_str664[sizeof("JIS_X0208-1990")];
+    char stringpool_str683[sizeof("MACUKRAINE")];
+    char stringpool_str688[sizeof("MS_KANJI")];
+    char stringpool_str689[sizeof("CSHALFWIDTHKATAKANA")];
+    char stringpool_str694[sizeof("JOHAB")];
+    char stringpool_str708[sizeof("CSPC850MULTILINGUAL")];
+    char stringpool_str713[sizeof("JIS_X0212.1990-0")];
+    char stringpool_str714[sizeof("BIG5HKSCS")];
+    char stringpool_str727[sizeof("BIG5-HKSCS")];
+    char stringpool_str764[sizeof("MACGREEK")];
+    char stringpool_str770[sizeof("MS-TURK")];
+    char stringpool_str771[sizeof("MS-GREEK")];
+    char stringpool_str791[sizeof("BIGFIVE")];
+    char stringpool_str804[sizeof("BIG-FIVE")];
+    char stringpool_str821[sizeof("MACTURKISH")];
+    char stringpool_str843[sizeof("WINBALTRIM")];
+    char stringpool_str844[sizeof("MACHEBREW")];
+    char stringpool_str849[sizeof("CSEUCPKDFMTJAPANESE")];
   };
 static const struct stringpool_t stringpool_contents =
   {
     "CN",
-    "L1",
-    "L2",
-    "L6",
-    "L5",
-    "L8",
-    "862",
-    "L3",
-    "866",
-    "C99",
-    "EUCCN",
-    "CP1251",
-    "CP1252",
-    "CP862",
-    "EUC-CN",
-    "CP1256",
-    "CP866",
-    "CP1255",
-    "HZ",
-    "CP1361",
-    "CP932",
-    "CP819",
-    "CP936",
-    "X0212",
-    "CP1258",
-    "L7",
-    "CP1253",
-    "L4",
-    "CP1133",
     "R8",
-    "CHINESE",
-    "ISO8859-1",
-    "ISO8859-2",
-    "ISO8859-6",
-    "ISO-8859-1",
-    "ISO8859-5",
-    "ISO-8859-2",
-    "X0201",
-    "ISO8859-16",
-    "ISO-8859-6",
-    "ISO8859-15",
-    "ISO-8859-5",
-    "ISO8859-9",
-    "ISO8859-8",
-    "ISO-8859-16",
-    "850",
-    "ISO-8859-15",
-    "ISO-8859-9",
-    "CP949",
-    "ISO-8859-8",
-    "ISO8859-3",
+    "866",
+    "862",
+    "CP1361",
+    "CP866",
+    "CP1251",
+    "CP1256",
+    "CP1255",
+    "CP1133",
+    "ASCII",
+    "CP862",
+    "CP1253",
+    "CHAR",
+    "CP1252",
+    "CP936",
+    "CP1258",
+    "C99",
+    "CP932",
     "ISO-IR-6",
-    "X0208",
-    "CYRILLIC",
-    "ISO-2022-CN",
-    "ISO8859-13",
-    "ISO-8859-3",
-    "CP1250",
-    "CP950",
-    "CP850",
-    "ISO646-CN",
-    "SJIS",
-    "ISO-8859-13",
-    "ISO-IR-126",
-    "ISO-IR-226",
+    "CP819",
     "ISO-IR-166",
     "ISO-IR-165",
-    "CP1257",
-    "ASCII",
+    "ISO-IR-126",
     "ISO-IR-58",
-    "CP367",
-    "LATIN1",
-    "ISO-IR-159",
-    "LATIN2",
-    "ISO-IR-199",
-    "LATIN6",
-    "LATIN5",
-    "ISO_8859-1",
-    "CSISO2022CN",
-    "ISO_8859-2",
+    "ISO-IR-226",
+    "ISO8859-1",
+    "ISO8859-6",
     "ISO-IR-138",
-    "CP1254",
-    "ISO_8859-6",
-    "ISO_8859-5",
-    "LATIN8",
-    "ISO-IR-101",
-    "ISO_8859-16",
+    "ISO8859-5",
+    "ISO8859-16",
+    "ISO8859-15",
+    "ISO8859-3",
+    "ISO8859-2",
+    "ISO8859-13",
+    "ISO8859-8",
+    "ISO-8859-1",
     "GB2312",
-    "ISO_8859-15",
-    "ISO-CELTIC",
-    "ISO_8859-9",
-    "LATIN3",
-    "ISO_8859-8",
-    "UHC",
-    "ISO8859-10",
-    "ISO_8859-15:1998",
-    "MAC",
-    "ISO_8859-3",
-    "ISO-IR-109",
-    "ISO8859-7",
-    "ISO-8859-10",
+    "ISO-8859-6",
+    "EUCCN",
+    "ISO-8859-5",
+    "ISO-8859-16",
+    "ISO-IR-159",
+    "ISO-8859-15",
+    "ISO-8859-3",
+    "ISO-8859-2",
+    "ISO-8859-13",
+    "ISO-8859-8",
+    "ISO-IR-101",
+    "850",
+    "EUC-CN",
+    "ISO8859-9",
+    "ISO-IR-199",
     "CSASCII",
-    "ISO_8859-13",
-    "ISO-IR-179",
-    "ISO-8859-7",
+    "ISO646-CN",
+    "CP850",
     "ISO-IR-203",
-    "ISO-IR-149",
-    "MS-EE",
+    "CP1250",
+    "HZ",
+    "ISO-8859-9",
+    "CP950",
+    "ISO-2022-CN",
+    "ISO_8859-1",
+    "CP949",
+    "ISO_8859-6",
     "ISO-IR-148",
+    "ISO_8859-5",
+    "ISO_8859-16",
+    "ISO-IR-109",
+    "ISO_8859-15",
+    "ISO_8859-3",
+    "ISO_8859-16:2001",
+    "ISO_8859-2",
+    "ISO_8859-13",
+    "ISO_8859-8",
+    "ISO-IR-110",
+    "ISO_8859-15:1998",
+    "ISO-2022-CN-EXT",
+    "CP1254",
+    "ISO-IR-149",
+    "L1",
+    "L6",
+    "L5",
+    "L3",
+    "L2",
+    "L8",
+    "ISO_8859-9",
+    "ISO8859-10",
+    "CSISO2022CN",
+    "ISO-IR-179",
+    "UHC",
+    "ISO-IR-14",
+    "ISO-8859-10",
+    "CP367",
+    "ISO_8859-10:1992",
+    "ISO-IR-100",
+    "LATIN1",
+    "CP1257",
+    "LATIN6",
+    "ISO8859-4",
+    "LATIN5",
+    "TIS620",
+    "ISO8859-14",
+    "ELOT_928",
+    "LATIN3",
+    "SJIS",
+    "LATIN2",
+    "LATIN8",
+    "ISO_8859-14:1998",
+    "GEORGIAN-ACADEMY",
+    "MAC",
+    "ISO-8859-4",
+    "TIS-620",
+    "ISO-8859-14",
+    "GB18030",
+    "X0212",
+    "L4",
+    "ISO-IR-57",
+    "ISO_8859-10",
+    "IBM866",
+    "ISO-IR-157",
+    "ISO-IR-87",
+    "ISO-IR-127",
     "US",
     "CP874",
-    "ISO8859-4",
-    "ISO-IR-110",
-    "ISO_8859-10:1992",
-    "ISO_8859-16:2000",
-    "ISO8859-14",
-    "ISO-8859-4",
     "IBM862",
-    "ISO-IR-57",
-    "IBM866",
-    "ISO-8859-14",
-    "ISO-IR-127",
-    "ISO-2022-CN-EXT",
-    "ISO-IR-87",
-    "ISO-IR-157",
-    "UCS-2",
-    "IBM819",
-    "ISO_8859-14:1998",
-    "ISO-IR-14",
-    "ELOT_928",
-    "LATIN7",
-    "UTF-16",
-    "ISO_8859-10",
-    "CSUNICODE",
-    "UCS-2LE",
-    "UTF-8",
-    "ISO-IR-100",
-    "ISO_8859-7",
-    "UTF-32",
-    "CHAR",
-    "UNICODE-1-1",
-    "CSUNICODE11",
-    "TIS620",
-    "EUCKR",
-    "UTF-16LE",
-    "LATIN4",
-    "KSC_5601",
-    "TIS-620",
-    "EUC-KR",
-    "IBM-CP1133",
-    "ISO_8859-4",
-    "UTF-32LE",
-    "VISCII",
-    "KOI8-R",
-    "ISO_8859-14",
-    "CSKOI8R",
-    "GREEK8",
-    "MS-CYRL",
-    "CSVISCII",
-    "IBM850",
+    "MS936",
+    "ISO8859-7",
+    "L7",
+    "LATIN-9",
     "ISO-IR-144",
-    "BIG5",
-    "UCS-4LE",
-    "GB18030",
-    "MACCYRILLIC",
-    "CSUNICODE11UTF7",
-    "UNICODE-1-1-UTF-7",
-    "BIG-5",
-    "IBM367",
-    "TIS620-0",
-    "CSBIG5",
-    "NEXTSTEP",
-    "CSKSC56011987",
-    "CSISOLATIN1",
-    "KOREAN",
-    "CSISOLATIN2",
-    "CN-BIG5",
-    "UTF-7",
-    "CSISOLATIN6",
-    "CSISOLATINCYRILLIC",
-    "CSISOLATIN5",
-    "TCVN",
-    "TIS620.2529-1",
-    "CSGB2312",
-    "ISO-10646-UCS-2",
-    "UCS-4",
-    "MULELAO-1",
-    "ISO-2022-KR",
-    "ECMA-118",
+    "L10",
+    "X0201",
+    "ROMAN8",
+    "ISO-8859-7",
+    "ISO_8859-4",
+    "IBM819",
+    "ARABIC",
+    "ISO_8859-14",
     "GB_2312-80",
-    "CSUCS4",
-    "GBK",
-    "CSISOLATIN3",
-    "ISO646-US",
-    "US-ASCII",
-    "TIS620.2533-1",
-    "KOI8-T",
-    "MS-ANSI",
-    "KS_C_5601-1989",
+    "BIG5",
+    "TIS620-0",
+    "UCS-2",
+    "X0208",
+    "CSBIG5",
+    "CSKOI8R",
     "GB_1988-80",
-    "EUCTW",
-    "GREEK",
-    "EUC-TW",
-    "WINDOWS-1251",
-    "WINDOWS-1252",
+    "BIG-5",
+    "KOI8-R",
+    "IBM-CP1133",
     "JP",
+    "US-ASCII",
+    "CN-BIG5",
+    "LATIN10",
+    "CHINESE",
+    "CSUNICODE11",
+    "ISO-CELTIC",
+    "CSGB2312",
+    "ISO_8859-7",
+    "CSISOLATIN1",
+    "CSISOLATIN6",
+    "CSISOLATIN5",
+    "TIS620.2533-1",
+    "MACCROATIAN",
+    "CSISOLATIN3",
+    "UNICODE-1-1",
+    "CSISOLATIN2",
+    "KOI8-T",
+    "CSISOLATINCYRILLIC",
+    "IBM850",
+    "MS-ANSI",
+    "TIS620.2529-1",
+    "LATIN4",
+    "GEORGIAN-PS",
+    "EUCKR",
+    "CSISOLATINARABIC",
+    "ECMA-118",
+    "UTF-16",
+    "ARMSCII-8",
+    "EUC-KR",
+    "ISO-10646-UCS-2",
+    "UTF-8",
+    "KOREAN",
+    "CYRILLIC",
+    "UTF-32",
+    "TIS620.2533-0",
+    "CSUNICODE",
+    "ISO_8859-5:1988",
+    "ISO_8859-3:1988",
+    "ISO_8859-8:1988",
+    "LATIN7",
+    "ISO-2022-KR",
+    "KSC_5601",
+    "MACTHAI",
+    "CSUCS4",
+    "UCS-4",
+    "CSUNICODE11UTF7",
+    "ISO_8859-9:1989",
+    "CN-GB-ISOIR165",
+    "EUCJP",
+    "IBM367",
+    "HP-ROMAN8",
+    "ASMO-708",
+    "ISO646-US",
+    "ISO-10646-UCS-4",
+    "UNICODE-1-1-UTF-7",
+    "EUC-JP",
+    "WCHAR_T",
+    "EUCTW",
+    "ISO-2022-JP-1",
+    "CSHPROMAN8",
+    "ISO646-JP",
+    "CSISO2022KR",
+    "TCVN",
+    "ISO-2022-JP-2",
+    "ISO_8859-4:1988",
+    "EUC-TW",
+    "CSISO58GB231280",
+    "MS-EE",
+    "ISO-2022-JP",
+    "CSISOLATIN4",
+    "CSPC862LATINHEBREW",
+    "NEXTSTEP",
+    "ISO_8859-1:1987",
+    "ISO_8859-6:1987",
+    "CSIBM866",
+    "ISO_8859-2:1987",
+    "HZ-GB-2312",
+    "WINDOWS-1251",
     "WINDOWS-1256",
     "WINDOWS-1255",
-    "VISCII1.1-1",
-    "CSISO2022KR",
-    "WINDOWS-1258",
-    "WINDOWS-1253",
-    "ARMSCII-8",
-    "CSIBM866",
-    "ROMAN8",
-    "HZ-GB-2312",
-    "EUCJP",
-    "TIS620.2533-0",
-    "KS_C_5601-1987",
-    "MACICELAND",
-    "ISO-10646-UCS-4",
-    "UCS-2BE",
-    "EUC-JP",
-    "WINDOWS-1250",
-    "ARABIC",
-    "UTF-16BE",
-    "TCVN-5712",
-    "WINDOWS-1257",
-    "CSPC862LATINHEBREW",
-    "TCVN5712-1",
-    "UTF-32BE",
-    "WINDOWS-1254",
-    "CSEUCKR",
-    "ASMO-708",
-    "CSISOLATINARABIC",
-    "MACINTOSH",
-    "UCS-2-INTERNAL",
-    "CSISOLATIN4",
     "ECMA-114",
-    "CN-GB-ISOIR165",
-    "ANSI_X3.4-1986",
-    "CSISO57GB1988",
-    "CSISO58GB231280",
-    "HP-ROMAN8",
-    "ANSI_X3.4-1968",
-    "MACTHAI",
-    "UCS-4BE",
-    "CSHPROMAN8",
-    "CN-GB",
-    "UNICODELITTLE",
-    "ISO_8859-5:1988",
-    "ISO_8859-9:1989",
-    "ISO_8859-8:1988",
-    "KOI8-U",
-    "ISO_8859-3:1988",
-    "ISO-2022-JP",
-    "ISO-2022-JP-1",
-    "ISO-2022-JP-2",
-    "CSISOLATINHEBREW",
-    "ISO646-JP",
-    "EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE",
-    "UCS-4-INTERNAL",
-    "ISO_8859-1:1987",
-    "ISO_8859-2:1987",
-    "ISO_8859-6:1987",
-    "CSISO2022JP",
-    "CSISO2022JP2",
-    "ISO_8859-4:1988",
-    "MACCENTRALEUROPE",
-    "HEBREW",
-    "MS-HEBR",
-    "ISO_646.IRV:1991",
-    "CSEUCTW",
-    "KOI8-RU",
-    "WINDOWS-874",
-    "JIS0208",
-    "GEORGIAN-PS",
-    "ISO_8859-7:1987",
-    "CSISOLATINGREEK",
-    "JIS_C6226-1983",
+    "WINDOWS-1253",
+    "WINDOWS-1252",
+    "WINDOWS-1258",
+    "GREEK8",
     "MACROMAN",
-    "UCS-2-SWAPPED",
-    "CSMACINTOSH",
-    "BIGFIVE",
-    "CSISO159JISX02121990",
-    "CSISO14JISC6220RO",
-    "CSPC850MULTILINGUAL",
-    "BIG-FIVE",
-    "JIS_C6220-1969-RO",
-    "JIS_X0212",
-    "BIG5HKSCS",
-    "JISX0201-1976",
-    "GEORGIAN-ACADEMY",
-    "BIG5-HKSCS",
-    "CSISO87JISX0208",
-    "MACGREEK",
-    "MS-GREEK",
-    "UCS-4-SWAPPED",
-    "MACCROATIAN",
-    "JIS_X0201",
-    "WCHAR_T",
-    "UNICODEBIG",
-    "JIS_X0212-1990",
-    "JIS_X0208",
+    "JIS_C6226-1983",
+    "CSISO2022JP2",
+    "WINDOWS-936",
+    "JIS0208",
+    "VISCII",
+    "CSISO57GB1988",
+    "KS_C_5601-1989",
+    "CSISO2022JP",
+    "CSVISCII",
+    "CN-GB",
     "MACARABIC",
-    "CSHALFWIDTHKATAKANA",
-    "JIS_X0208-1983",
-    "SHIFT-JIS",
-    "MACUKRAINE",
-    "CSEUCPKDFMTJAPANESE",
-    "JIS_X0208-1990",
-    "CSSHIFTJIS",
-    "JIS_X0212.1990-0",
-    "MACHEBREW",
-    "SHIFT_JIS",
-    "TCVN5712-1:1993",
-    "MS-TURK",
-    "MACTURKISH",
+    "WINDOWS-1250",
     "MACROMANIA",
+    "CSKSC56011987",
+    "JIS_C6220-1969-RO",
+    "UTF-7",
+    "CSEUCKR",
+    "CSISO14JISC6220RO",
+    "WINDOWS-1254",
+    "CSISO159JISX02121990",
+    "ISO_8859-7:1987",
+    "MACICELAND",
+    "WINDOWS-1257",
+    "GBK",
+    "KS_C_5601-1987",
+    "TCVN5712-1",
+    "TCVN-5712",
+    "UCS-2-INTERNAL",
+    "MACINTOSH",
+    "UNICODELITTLE",
+    "UCS-2LE",
+    "ANSI_X3.4-1986",
+    "MS-CYRL",
+    "ANSI_X3.4-1968",
+    "CSISOLATINHEBREW",
+    "MACCYRILLIC",
+    "CSMACINTOSH",
+    "CSEUCTW",
+    "UNICODEBIG",
+    "UCS-2-SWAPPED",
+    "CSISOLATINGREEK",
+    "UCS-2BE",
+    "KOI8-U",
+    "UCS-4-INTERNAL",
+    "VISCII1.1-1",
+    "KOI8-RU",
+    "UCS-4LE",
+    "MS-HEBR",
+    "EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE",
+    "UTF-16LE",
+    "MULELAO-1",
+    "UTF-32LE",
+    "MACCENTRALEUROPE",
+    "UCS-4-SWAPPED",
+    "WINDOWS-874",
+    "ISO_646.IRV:1991",
+    "UCS-4BE",
+    "SHIFT-JIS",
+    "JIS_X0212",
     "MS-ARAB",
+    "GREEK",
+    "UTF-16BE",
+    "JISX0201-1976",
+    "UTF-32BE",
     "JAVA",
+    "JIS_X0201",
+    "HEBREW",
+    "SHIFT_JIS",
+    "JIS_X0208",
+    "CSISO87JISX0208",
+    "JIS_X0212-1990",
+    "JIS_X0208-1983",
+    "TCVN5712-1:1993",
+    "CSSHIFTJIS",
+    "JIS_X0208-1990",
+    "MACUKRAINE",
     "MS_KANJI",
+    "CSHALFWIDTHKATAKANA",
     "JOHAB",
-    "WINBALTRIM"
+    "CSPC850MULTILINGUAL",
+    "JIS_X0212.1990-0",
+    "BIG5HKSCS",
+    "BIG5-HKSCS",
+    "MACGREEK",
+    "MS-TURK",
+    "MS-GREEK",
+    "BIGFIVE",
+    "BIG-FIVE",
+    "MACTURKISH",
+    "WINBALTRIM",
+    "MACHEBREW",
+    "CSEUCPKDFMTJAPANESE"
   };
 #define stringpool ((const char *) &stringpool_contents)
 
 static const struct alias aliases[] =
   {
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 271 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_iso646_cn},
-    {-1},
-#line 60 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_iso8859_1},
-#line 68 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_iso8859_2},
-    {-1},
-#line 133 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, ei_iso8859_10},
-#line 125 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, ei_iso8859_9},
-    {-1}, {-1}, {-1}, {-1},
-#line 147 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_iso8859_14},
     {-1}, {-1},
-#line 196 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_cp862},
-#line 76 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, ei_iso8859_3},
-    {-1}, {-1},
-#line 200 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ei_cp866},
-#line 51 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, ei_c99},
+#line 274 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, ei_iso646_cn},
     {-1}, {-1}, {-1},
-#line 301 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, ei_euc_cn},
-    {-1}, {-1},
-#line 167 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, ei_cp1251},
+#line 222 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_hp_roman8},
     {-1},
+#line 203 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_cp866},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 199 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, ei_cp862},
+#line 336 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_johab},
+#line 201 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_cp866},
 #line 170 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_cp1252},
-#line 194 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, ei_cp862},
-#line 300 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str45, ei_euc_cn},
-    {-1},
-#line 182 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, ei_cp1256},
-#line 198 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str48, ei_cp866},
-#line 179 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, ei_cp1255},
-#line 311 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str50, ei_hz},
-    {-1},
-#line 331 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str52, ei_johab},
-#line 294 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str53, ei_cp932},
-    {-1},
-#line 57 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_iso8859_1},
-    {-1},
-#line 306 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, ei_ces_gbk},
-#line 265 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str58, ei_jisx0212},
-#line 188 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str59, ei_cp1258},
-    {-1}, {-1},
-#line 140 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str62, ei_iso8859_13},
-    {-1}, {-1}, {-1}, {-1},
-#line 173 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str67, ei_cp1253},
-    {-1}, {-1}, {-1}, {-1},
-#line 84 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, ei_iso8859_4},
-    {-1}, {-1},
-#line 227 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_cp1133},
-    {-1},
-#line 219 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_hp_roman8},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 276 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str84, ei_gb2312},
-#line 62 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str85, ei_iso8859_1},
-    {-1},
-#line 70 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_iso8859_2},
-    {-1}, {-1}, {-1},
-#line 102 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_iso8859_6},
-#line 53 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_iso8859_1},
-#line 93 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_5},
-#line 63 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str94, ei_iso8859_2},
-#line 252 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str95, ei_jisx0201},
-    {-1},
-#line 159 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_16},
-#line 94 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_6},
-#line 154 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str99, ei_iso8859_15},
-#line 87 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str100, ei_iso8859_5},
-#line 127 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str101, ei_iso8859_9},
-    {-1},
-#line 119 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_8},
-#line 155 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str104, ei_iso8859_16},
-#line 192 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str105, ei_cp850},
-#line 150 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str106, ei_iso8859_15},
-    {-1},
-#line 120 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_iso8859_9},
-#line 328 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str109, ei_cp949},
-#line 113 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str110, ei_iso8859_8},
-#line 78 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str111, ei_iso8859_3},
-#line 16 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_ascii},
-#line 258 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_jisx0208},
-#line 91 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_iso8859_5},
-    {-1},
-#line 308 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str116, ei_iso2022_cn},
-#line 141 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str117, ei_iso8859_13},
-#line 71 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str118, ei_iso8859_3},
-#line 164 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str119, ei_cp1250},
-#line 322 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_cp950},
-#line 190 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str121, ei_cp850},
-#line 269 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str122, ei_iso646_cn},
-#line 291 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_sjis},
-#line 136 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_13},
-#line 106 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_7},
-#line 158 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str126, ei_iso8859_16},
-#line 235 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str127, ei_tis620},
-    {-1},
-#line 277 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str129, ei_isoir165},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, ei_cp1251},
     {-1},
 #line 185 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str131, ei_cp1257},
-#line 13 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str132, ei_ascii},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, ei_cp1256},
     {-1},
-#line 274 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str134, ei_gb2312},
-    {-1},
-#line 19 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_ascii},
-#line 59 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str137, ei_iso8859_1},
-#line 266 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str138, ei_jisx0212},
-#line 67 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_2},
-    {-1}, {-1},
-#line 145 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_14},
-#line 132 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_10},
-    {-1},
-#line 124 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_iso8859_9},
-#line 54 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_1},
-#line 309 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_iso2022_cn},
-#line 64 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_2},
-#line 116 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str149, ei_iso8859_8},
-    {-1},
-#line 176 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_cp1254},
-#line 95 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str152, ei_iso8859_6},
-    {-1},
-#line 88 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str154, ei_iso8859_5},
-#line 146 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_14},
-    {-1},
-#line 66 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str157, ei_iso8859_2},
-#line 156 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_16},
-#line 302 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str159, ei_euc_cn},
-#line 151 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str160, ei_iso8859_15},
-#line 148 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str161, ei_iso8859_14},
-#line 121 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_9},
-#line 75 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_3},
-#line 114 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_8},
-#line 329 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str165, ei_cp949},
-    {-1}, {-1}, {-1},
-#line 135 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str169, ei_iso8859_10},
-#line 152 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str170, ei_iso8859_15},
-#line 204 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str171, ei_mac_roman},
-#line 72 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str172, ei_iso8859_3},
-#line 74 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str173, ei_iso8859_3},
-    {-1},
-#line 112 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str175, ei_iso8859_7},
-#line 128 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_iso8859_10},
-#line 22 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str177, ei_ascii},
-#line 137 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str178, ei_iso8859_13},
-#line 138 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_13},
-    {-1}, {-1},
-#line 103 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str182, ei_iso8859_7},
-    {-1},
-#line 153 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str184, ei_iso8859_15},
-    {-1}, {-1}, {-1}, {-1},
-#line 282 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str189, ei_ksc5601},
-#line 166 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str190, ei_cp1250},
-#line 123 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str191, ei_iso8859_9},
-#line 21 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str192, ei_ascii},
-    {-1},
-#line 236 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str194, ei_cp874},
-#line 86 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str195, ei_iso8859_4},
-#line 82 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str196, ei_iso8859_4},
-#line 130 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_iso8859_10},
-    {-1},
-#line 157 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str199, ei_iso8859_16},
-    {-1},
-#line 149 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str201, ei_iso8859_14},
-#line 79 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str202, ei_iso8859_4},
-#line 195 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str203, ei_cp862},
-    {-1}, {-1},
-#line 270 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str206, ei_iso646_cn},
-#line 199 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str207, ei_cp866},
-#line 142 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str208, ei_iso8859_14},
-#line 97 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str209, ei_iso8859_6},
-#line 310 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str210, ei_iso2022_cn_ext},
-#line 259 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str211, ei_jisx0208},
-#line 131 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str212, ei_iso8859_10},
-#line 24 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str213, ei_ucs2},
-#line 58 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str214, ei_iso8859_1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 144 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str221, ei_iso8859_14},
-#line 247 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_iso646_jp},
-    {-1}, {-1},
-#line 108 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str225, ei_iso8859_7},
-    {-1},
-#line 139 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str227, ei_iso8859_13},
-#line 38 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_utf16},
-    {-1},
-#line 129 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str230, ei_iso8859_10},
-    {-1},
-#line 26 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str232, ei_ucs2},
-#line 31 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str233, ei_ucs2le},
-#line 23 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str234, ei_utf8},
-#line 56 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str235, ei_iso8859_1},
-#line 104 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str236, ei_iso8859_7},
-#line 41 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str237, ei_utf32},
-#line 334 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str238, ei_local_char},
-    {-1}, {-1},
-#line 29 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_ucs2be},
-#line 30 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_ucs2be},
-    {-1},
+#line 182 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, ei_cp1255},
 #line 230 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str244, ei_tis620},
-#line 326 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str245, ei_euc_kr},
-#line 40 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str246, ei_utf16le},
-#line 83 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str247, ei_iso8859_4},
-    {-1}, {-1},
-#line 279 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str250, ei_ksc5601},
-#line 229 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str251, ei_tis620},
-#line 325 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str252, ei_euc_kr},
-    {-1},
-#line 228 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str254, ei_cp1133},
-    {-1},
-#line 80 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str256, ei_iso8859_4},
-#line 43 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str257, ei_utf32le},
-#line 238 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str258, ei_viscii},
-#line 160 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_koi8_r},
-    {-1}, {-1},
-#line 143 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str262, ei_iso8859_14},
-    {-1},
-#line 161 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str264, ei_koi8_r},
-    {-1},
-#line 109 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str266, ei_iso8859_7},
-#line 169 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_cp1251},
-    {-1}, {-1},
-#line 240 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str270, ei_viscii},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 191 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str280, ei_cp850},
-    {-1}, {-1},
-#line 90 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str283, ei_iso8859_5},
-    {-1}, {-1},
-#line 316 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str286, ei_ces_big5},
-#line 37 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str287, ei_ucs4le},
-#line 307 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str288, ei_gb18030},
-    {-1},
-#line 210 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_mac_cyrillic},
-#line 46 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str291, ei_utf7},
-#line 45 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str292, ei_utf7},
-#line 317 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str293, ei_ces_big5},
-    {-1},
-#line 20 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str295, ei_ascii},
-#line 231 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str296, ei_tis620},
-    {-1},
-#line 321 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str298, ei_ces_big5},
-#line 221 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str299, ei_nextstep},
-    {-1},
-#line 283 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str301, ei_ksc5601},
-#line 61 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str302, ei_iso8859_1},
-#line 284 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str303, ei_ksc5601},
-#line 69 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_iso8859_2},
-#line 320 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str305, ei_ces_big5},
-#line 44 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str306, ei_utf7},
-    {-1},
-#line 134 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str308, ei_iso8859_10},
-#line 92 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str309, ei_iso8859_5},
-#line 126 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str310, ei_iso8859_9},
-    {-1},
-#line 241 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str312, ei_tcvn},
-    {-1}, {-1},
-#line 232 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str315, ei_tis620},
-    {-1}, {-1},
-#line 304 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str318, ei_euc_cn},
-    {-1},
-#line 25 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2},
-#line 33 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str321, ei_ucs4},
-#line 226 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str322, ei_mulelao},
-#line 332 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str323, ei_iso2022_kr},
-#line 107 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str324, ei_iso8859_7},
-#line 273 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str325, ei_gb2312},
-#line 35 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str326, ei_ucs4},
-#line 305 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str327, ei_ces_gbk},
-#line 77 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str328, ei_iso8859_3},
-#line 14 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str329, ei_ascii},
-    {-1},
-#line 12 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str331, ei_ascii},
-#line 234 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str332, ei_tis620},
-#line 225 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str333, ei_koi8_t},
-#line 172 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str334, ei_cp1252},
-#line 281 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str335, ei_ksc5601},
-#line 268 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str336, ei_iso646_cn},
-    {-1}, {-1},
-#line 314 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str339, ei_euc_tw},
-    {-1}, {-1}, {-1},
-#line 110 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str343, ei_iso8859_7},
-    {-1}, {-1},
-#line 313 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str346, ei_euc_tw},
-#line 168 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str347, ei_cp1251},
-#line 171 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str348, ei_cp1252},
-#line 248 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str349, ei_iso646_jp},
-#line 183 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str350, ei_cp1256},
-#line 180 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str351, ei_cp1255},
-    {-1},
-#line 239 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str353, ei_viscii},
-#line 333 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str354, ei_iso2022_kr},
-    {-1},
-#line 189 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str356, ei_cp1258},
-    {-1}, {-1}, {-1},
-#line 174 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str360, ei_cp1253},
-#line 222 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str361, ei_armscii_8},
-    {-1}, {-1}, {-1}, {-1},
-#line 201 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str366, ei_cp866},
-    {-1},
-#line 218 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str368, ei_hp_roman8},
-#line 312 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_hz},
-#line 286 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str370, ei_euc_jp},
-#line 233 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str371, ei_tis620},
-#line 280 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_ksc5601},
-#line 207 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str373, ei_mac_iceland},
-#line 34 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str374, ei_ucs4},
-#line 27 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str375, ei_ucs2be},
-    {-1},
-#line 285 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str377, ei_euc_jp},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 165 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str386, ei_cp1250},
-#line 100 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str387, ei_iso8859_6},
-#line 39 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str388, ei_utf16be},
-    {-1}, {-1},
-#line 242 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str391, ei_tcvn},
-#line 186 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str392, ei_cp1257},
-    {-1},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ei_cp1133},
+#line 13 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, ei_ascii},
 #line 197 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str394, ei_cp862},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, ei_cp862},
+#line 176 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, ei_cp1253},
+#line 339 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, ei_local_char},
+#line 173 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, ei_cp1252},
+#line 309 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, ei_ces_gbk},
+#line 191 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, ei_cp1258},
     {-1},
-#line 243 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str396, ei_tcvn},
-    {-1}, {-1},
-#line 42 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str399, ei_utf32be},
-    {-1}, {-1},
-#line 177 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str402, ei_cp1254},
+#line 51 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, ei_c99},
+    {-1}, {-1}, {-1}, {-1},
+#line 297 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, ei_cp932},
     {-1},
-#line 327 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str404, ei_euc_kr},
+#line 16 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, ei_ascii},
+    {-1}, {-1}, {-1}, {-1},
+#line 57 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str54, ei_iso8859_1},
     {-1},
-#line 99 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str406, ei_iso8859_6},
-    {-1}, {-1},
-#line 101 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str409, ei_iso8859_6},
-#line 203 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str410, ei_mac_roman},
-#line 47 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str411, ei_ucs2internal},
-#line 85 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str412, ei_iso8859_4},
+#line 238 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str56, ei_tis620},
+    {-1},
+#line 280 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str58, ei_isoir165},
+    {-1},
+#line 106 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str60, ei_iso8859_7},
     {-1}, {-1}, {-1},
-#line 98 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str416, ei_iso8859_6},
+#line 277 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str64, ei_gb2312},
+#line 159 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str65, ei_iso8859_16},
+#line 62 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str66, ei_iso8859_1},
     {-1},
-#line 278 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str418, ei_isoir165},
+#line 102 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str68, ei_iso8859_6},
+#line 116 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str69, ei_iso8859_8},
+#line 93 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str70, ei_iso8859_5},
+#line 162 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str71, ei_iso8859_16},
     {-1},
-#line 18 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str420, ei_ascii},
-#line 272 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str421, ei_iso646_cn},
+#line 155 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str73, ei_iso8859_15},
+#line 78 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_3},
     {-1},
-#line 275 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str423, ei_gb2312},
-#line 217 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str424, ei_hp_roman8},
+#line 70 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str76, ei_iso8859_2},
+#line 141 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_iso8859_13},
+#line 119 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str78, ei_iso8859_8},
+#line 53 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_iso8859_1},
+#line 305 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str80, ei_euc_cn},
+#line 94 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str81, ei_iso8859_6},
+#line 304 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str82, ei_euc_cn},
+#line 87 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str83, ei_iso8859_5},
+#line 156 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str84, ei_iso8859_16},
+#line 269 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str85, ei_jisx0212},
+#line 150 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str86, ei_iso8859_15},
+#line 71 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_iso8859_3},
     {-1},
-#line 17 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str426, ei_ascii},
-#line 216 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str427, ei_mac_thai},
-    {-1},
-#line 36 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str429, ei_ucs4be},
-#line 220 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str430, ei_hp_roman8},
+#line 63 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str89, ei_iso8859_2},
+#line 136 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str90, ei_iso8859_13},
+#line 113 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_iso8859_8},
+#line 66 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_iso8859_2},
+#line 195 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_cp850},
     {-1},
 #line 303 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str432, ei_euc_cn},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str95, ei_euc_cn},
+#line 127 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_9},
     {-1},
-#line 32 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str434, ei_ucs2le},
-#line 89 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str435, ei_iso8859_5},
-    {-1}, {-1},
-#line 122 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str438, ei_iso8859_9},
-    {-1},
-#line 115 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str440, ei_iso8859_8},
-#line 162 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str441, ei_koi8_u},
-    {-1}, {-1},
-#line 73 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str444, ei_iso8859_3},
+#line 145 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_14},
+#line 22 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str99, ei_ascii},
+#line 272 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str100, ei_iso646_cn},
     {-1}, {-1}, {-1},
-#line 295 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str448, ei_iso2022_jp},
-#line 297 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str449, ei_iso2022_jp1},
-#line 298 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str450, ei_iso2022_jp2},
-#line 118 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str451, ei_iso8859_8},
-    {-1}, {-1},
-#line 246 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str454, ei_iso646_jp},
-    {-1}, {-1},
-#line 287 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str457, ei_euc_jp},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 49 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str465, ei_ucs4internal},
+#line 193 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str104, ei_cp850},
+#line 153 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str105, ei_iso8859_15},
+#line 167 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str106, ei_cp1250},
+#line 316 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str107, ei_hz},
     {-1},
-#line 55 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str467, ei_iso8859_1},
-#line 65 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str468, ei_iso8859_2},
+#line 120 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str109, ei_iso8859_9},
+    {-1}, {-1}, {-1},
+#line 327 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_cp950},
+#line 313 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_iso2022_cn},
     {-1},
-#line 96 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str470, ei_iso8859_6},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 296 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str479, ei_iso2022_jp},
-#line 299 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str480, ei_iso2022_jp2},
-    {-1}, {-1}, {-1}, {-1}, {-1},
-#line 81 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str486, ei_iso8859_4},
+#line 54 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str116, ei_iso8859_1},
+#line 333 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str117, ei_cp949},
+#line 95 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str118, ei_iso8859_6},
+#line 123 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_9},
+#line 88 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_iso8859_5},
+#line 157 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str121, ei_iso8859_16},
+#line 74 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str122, ei_iso8859_3},
+#line 151 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_iso8859_15},
+#line 72 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_3},
+#line 158 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_16},
+#line 64 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str126, ei_iso8859_2},
+#line 137 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str127, ei_iso8859_13},
+#line 114 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_8},
     {-1}, {-1},
-#line 206 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str489, ei_mac_centraleurope},
-    {-1}, {-1},
-#line 117 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str492, ei_iso8859_8},
-    {-1},
-#line 181 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str494, ei_cp1255},
-    {-1},
-#line 15 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str496, ei_ascii},
+#line 82 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str131, ei_iso8859_4},
+#line 152 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_15},
     {-1},
 #line 315 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str498, ei_euc_tw},
-    {-1}, {-1}, {-1}, {-1},
-#line 163 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str503, ei_koi8_ru},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str134, ei_iso2022_cn_ext},
     {-1},
-#line 237 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str505, ei_cp874},
-    {-1}, {-1},
-#line 257 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str508, ei_jisx0208},
-#line 224 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str509, ei_georgian_ps},
-    {-1}, {-1},
-#line 105 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str512, ei_iso8859_7},
+#line 179 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_cp1254},
+#line 285 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str137, ei_ksc5601},
     {-1},
-#line 111 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str514, ei_iso8859_7},
-#line 260 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str515, ei_jisx0208},
-    {-1}, {-1},
-#line 202 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str518, ei_mac_roman},
-#line 48 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str519, ei_ucs2swapped},
-    {-1}, {-1}, {-1}, {-1},
-#line 205 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str524, ei_mac_roman},
-    {-1}, {-1},
-#line 319 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str527, ei_ces_big5},
-#line 267 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str528, ei_jisx0212},
-#line 249 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str529, ei_iso646_jp},
-#line 193 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str530, ei_cp850},
-    {-1}, {-1}, {-1},
-#line 318 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str534, ei_ces_big5},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 245 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str541, ei_iso646_jp},
-    {-1}, {-1}, {-1},
-#line 262 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str545, ei_jisx0212},
-    {-1}, {-1}, {-1},
-#line 324 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str549, ei_big5hkscs},
-    {-1}, {-1}, {-1},
-#line 251 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str553, ei_jisx0201},
-#line 223 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str554, ei_georgian_academy},
+#line 60 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_1},
+#line 133 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str140, ei_iso8859_10},
+#line 125 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str141, ei_iso8859_9},
     {-1},
-#line 323 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str556, ei_big5hkscs},
-    {-1}, {-1}, {-1},
-#line 261 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str560, ei_jisx0208},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 212 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str570, ei_mac_greek},
-#line 175 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str571, ei_cp1253},
+#line 76 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_3},
+#line 68 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_2},
+#line 147 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_iso8859_14},
+#line 121 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_9},
+#line 135 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_iso8859_10},
+    {-1}, {-1}, {-1}, {-1}, {-1},
+#line 314 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_iso2022_cn},
     {-1},
-#line 50 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str573, ei_ucs4swapped},
-    {-1}, {-1}, {-1}, {-1},
-#line 208 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str578, ei_mac_croatian},
-    {-1}, {-1}, {-1},
+#line 138 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_13},
+#line 334 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str156, ei_cp949},
+    {-1},
 #line 250 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str582, ei_jisx0201},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_iso646_jp},
+    {-1},
+#line 128 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str160, ei_iso8859_10},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 19 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str167, ei_ascii},
+#line 130 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str168, ei_iso8859_10},
+    {-1},
+#line 56 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str170, ei_iso8859_1},
+#line 59 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str171, ei_iso8859_1},
+#line 188 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str172, ei_cp1257},
+#line 132 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str173, ei_iso8859_10},
+#line 86 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str174, ei_iso8859_4},
+#line 124 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str175, ei_iso8859_9},
+#line 233 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_tis620},
+#line 149 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str177, ei_iso8859_14},
+#line 108 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str178, ei_iso8859_7},
+#line 75 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_3},
+#line 294 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str180, ei_sjis},
+#line 67 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str181, ei_iso8859_2},
+    {-1},
+#line 146 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str183, ei_iso8859_14},
+#line 144 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str184, ei_iso8859_14},
+#line 226 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str185, ei_georgian_academy},
+#line 207 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str186, ei_mac_roman},
+#line 79 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str187, ei_iso8859_4},
+    {-1},
+#line 232 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str189, ei_tis620},
+#line 142 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str190, ei_iso8859_14},
+#line 312 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str191, ei_gb18030},
+#line 268 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str192, ei_jisx0212},
+#line 84 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str193, ei_iso8859_4},
     {-1}, {-1},
-#line 335 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str585, ei_local_wchar_t},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 28 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str594, ei_ucs2be},
+#line 273 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str196, ei_iso646_cn},
+#line 129 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_iso8859_10},
+#line 202 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str198, ei_cp866},
+#line 131 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str199, ei_iso8859_10},
+#line 262 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str200, ei_jisx0208},
+    {-1},
+#line 97 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str202, ei_iso8859_6},
+#line 21 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str203, ei_ascii},
+#line 239 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str204, ei_cp874},
+    {-1},
+#line 198 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str206, ei_cp862},
+#line 310 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str207, ei_ces_gbk},
+    {-1}, {-1},
+#line 112 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str210, ei_iso8859_7},
+#line 140 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str211, ei_iso8859_13},
+    {-1}, {-1},
+#line 154 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str214, ei_iso8859_15},
+#line 90 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str215, ei_iso8859_5},
     {-1}, {-1}, {-1}, {-1},
-#line 264 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str599, ei_jisx0212},
-#line 254 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str600, ei_jisx0208},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1},
-#line 215 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str614, ei_mac_arabic},
-    {-1}, {-1}, {-1}, {-1},
-#line 253 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str619, ei_jisx0201},
+#line 161 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str220, ei_iso8859_16},
 #line 255 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str620, ei_jisx0208},
-#line 290 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str621, ei_sjis},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str221, ei_jisx0201},
+#line 221 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_hp_roman8},
+#line 103 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str223, ei_iso8859_7},
+#line 80 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str224, ei_iso8859_4},
+#line 58 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str225, ei_iso8859_1},
+#line 100 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str226, ei_iso8859_6},
+#line 143 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str227, ei_iso8859_14},
+#line 276 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_gb2312},
+#line 321 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str229, ei_ces_big5},
+    {-1},
+#line 234 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str231, ei_tis620},
+#line 24 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str232, ei_ucs2},
+#line 261 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str233, ei_jisx0208},
     {-1}, {-1}, {-1}, {-1},
+#line 326 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str238, ei_ces_big5},
+#line 164 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str239, ei_koi8_r},
+    {-1},
+#line 271 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_iso646_cn},
+#line 322 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_ces_big5},
+#line 163 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str243, ei_koi8_r},
+#line 231 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str244, ei_cp1133},
+    {-1}, {-1}, {-1}, {-1},
+#line 251 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str249, ei_iso646_jp},
+#line 12 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str250, ei_ascii},
+#line 325 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str251, ei_ces_big5},
+#line 160 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str252, ei_iso8859_16},
+#line 279 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str253, ei_gb2312},
+    {-1},
+#line 30 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str255, ei_ucs2be},
+    {-1},
+#line 148 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str257, ei_iso8859_14},
+    {-1},
+#line 307 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_euc_cn},
+#line 104 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str260, ei_iso8859_7},
+#line 61 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str261, ei_iso8859_1},
+    {-1},
+#line 134 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str263, ei_iso8859_10},
+    {-1},
+#line 126 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str265, ei_iso8859_9},
+#line 237 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str266, ei_tis620},
 #line 211 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str626, ei_mac_ukraine},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_mac_croatian},
+    {-1},
+#line 77 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str269, ei_iso8859_3},
+#line 29 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str270, ei_ucs2be},
+#line 69 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str271, ei_iso8859_2},
+    {-1},
+#line 228 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str273, ei_koi8_t},
+#line 92 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str274, ei_iso8859_5},
+#line 194 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str275, ei_cp850},
+#line 175 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str276, ei_cp1252},
+    {-1},
+#line 235 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str278, ei_tis620},
+#line 83 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str279, ei_iso8859_4},
+#line 227 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str280, ei_georgian_ps},
+    {-1}, {-1}, {-1},
+#line 331 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str284, ei_euc_kr},
+#line 101 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str285, ei_iso8859_6},
+    {-1}, {-1}, {-1}, {-1},
+#line 107 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_iso8859_7},
+    {-1},
+#line 38 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str292, ei_utf16},
+    {-1}, {-1},
+#line 225 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str295, ei_armscii_8},
+    {-1},
+#line 330 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str297, ei_euc_kr},
+#line 25 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str298, ei_ucs2},
+#line 23 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str299, ei_utf8},
+    {-1},
+#line 287 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str301, ei_ksc5601},
+#line 91 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str302, ei_iso8859_5},
+    {-1},
+#line 41 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_utf32},
+#line 236 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str305, ei_tis620},
+#line 26 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str306, ei_ucs2},
+    {-1}, {-1}, {-1},
+#line 89 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str310, ei_iso8859_5},
+    {-1},
+#line 73 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str312, ei_iso8859_3},
+    {-1},
+#line 115 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str314, ei_iso8859_8},
+#line 139 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str315, ei_iso8859_13},
+#line 337 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str316, ei_iso2022_kr},
+    {-1}, {-1},
+#line 282 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str319, ei_ksc5601},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 219 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str327, ei_mac_thai},
+    {-1},
+#line 35 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str329, ei_ucs4},
+#line 33 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str330, ei_ucs4},
+#line 46 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str331, ei_utf7},
+#line 122 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str332, ei_iso8859_9},
+#line 281 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str333, ei_isoir165},
+    {-1}, {-1},
+#line 289 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str336, ei_euc_jp},
+    {-1},
+#line 20 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str338, ei_ascii},
+#line 220 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str339, ei_hp_roman8},
+    {-1}, {-1}, {-1}, {-1},
+#line 99 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str344, ei_iso8859_6},
+    {-1},
+#line 14 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str346, ei_ascii},
+#line 34 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str347, ei_ucs4},
+#line 45 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str348, ei_utf7},
 #line 288 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str635, ei_euc_jp},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str349, ei_euc_jp},
+#line 340 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str350, ei_local_wchar_t},
+#line 319 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str351, ei_euc_tw},
+#line 300 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str352, ei_iso2022_jp1},
+#line 223 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str353, ei_hp_roman8},
+#line 249 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str354, ei_iso646_jp},
+#line 338 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str355, ei_iso2022_kr},
+#line 244 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str356, ei_tcvn},
+#line 301 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str357, ei_iso2022_jp2},
+    {-1}, {-1}, {-1}, {-1},
+#line 81 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str362, ei_iso8859_4},
+    {-1},
+#line 318 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str364, ei_euc_tw},
+#line 278 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str365, ei_gb2312},
+    {-1},
+#line 169 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str367, ei_cp1250},
+#line 298 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str368, ei_iso2022_jp},
+#line 85 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_iso8859_4},
+    {-1}, {-1},
+#line 200 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_cp862},
+#line 224 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str373, ei_nextstep},
+#line 55 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str374, ei_iso8859_1},
+#line 96 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str375, ei_iso8859_6},
+    {-1},
+#line 204 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str377, ei_cp866},
+    {-1},
+#line 65 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str379, ei_iso8859_2},
+#line 317 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str380, ei_hz},
+    {-1}, {-1},
+#line 171 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str383, ei_cp1251},
+#line 186 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str384, ei_cp1256},
+#line 183 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str385, ei_cp1255},
+#line 98 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str386, ei_iso8859_6},
+#line 177 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str387, ei_cp1253},
+#line 174 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str388, ei_cp1252},
+#line 192 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str389, ei_cp1258},
+#line 109 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str390, ei_iso8859_7},
+    {-1},
+#line 205 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str392, ei_mac_roman},
+#line 263 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str393, ei_jisx0208},
+    {-1},
+#line 302 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str395, ei_iso2022_jp2},
+#line 311 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str396, ei_ces_gbk},
+#line 260 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str397, ei_jisx0208},
+    {-1},
+#line 241 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str399, ei_viscii},
+    {-1}, {-1},
+#line 275 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str402, ei_iso646_cn},
+#line 284 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str403, ei_ksc5601},
+    {-1}, {-1}, {-1},
+#line 299 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str407, ei_iso2022_jp},
+#line 243 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str408, ei_viscii},
+    {-1}, {-1},
+#line 306 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str411, ei_euc_cn},
+#line 218 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str412, ei_mac_arabic},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 168 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str422, ei_cp1250},
+    {-1}, {-1}, {-1}, {-1}, {-1},
+#line 212 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str428, ei_mac_romania},
+#line 286 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str429, ei_ksc5601},
+#line 248 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str430, ei_iso646_jp},
+#line 44 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str431, ei_utf7},
+    {-1}, {-1},
+#line 332 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str434, ei_euc_kr},
+    {-1},
+#line 252 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str436, ei_iso646_jp},
+#line 180 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str437, ei_cp1254},
+#line 270 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str438, ei_jisx0212},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 105 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str446, ei_iso8859_7},
+#line 210 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str447, ei_mac_iceland},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 189 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str455, ei_cp1257},
+    {-1}, {-1},
+#line 308 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str458, ei_ces_gbk},
+    {-1},
+#line 283 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str460, ei_ksc5601},
+#line 246 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str461, ei_tcvn},
+    {-1},
+#line 245 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str463, ei_tcvn},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 47 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str471, ei_ucs2internal},
+    {-1},
+#line 206 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str473, ei_mac_roman},
+    {-1}, {-1}, {-1}, {-1},
+#line 32 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str478, ei_ucs2le},
+    {-1},
+#line 31 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str480, ei_ucs2le},
+    {-1}, {-1},
+#line 18 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str483, ei_ascii},
+    {-1},
+#line 172 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str485, ei_cp1251},
+    {-1}, {-1},
+#line 17 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str488, ei_ascii},
+    {-1}, {-1}, {-1}, {-1},
+#line 118 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str493, ei_iso8859_8},
+    {-1}, {-1},
+#line 213 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str496, ei_mac_cyrillic},
+    {-1},
+#line 208 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str498, ei_mac_roman},
+    {-1}, {-1},
+#line 320 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str501, ei_euc_tw},
+    {-1},
+#line 28 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str503, ei_ucs2be},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 48 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str510, ei_ucs2swapped},
+#line 111 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str511, ei_iso8859_7},
+    {-1}, {-1}, {-1}, {-1}, {-1},
+#line 27 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str517, ei_ucs2be},
+    {-1},
+#line 165 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str519, ei_koi8_u},
+#line 49 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str520, ei_ucs4internal},
+#line 242 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str521, ei_viscii},
+    {-1}, {-1}, {-1},
+#line 166 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str525, ei_koi8_ru},
+    {-1}, {-1}, {-1},
+#line 37 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str529, ei_ucs4le},
+    {-1}, {-1}, {-1},
+#line 184 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str533, ei_cp1255},
+    {-1}, {-1}, {-1},
+#line 290 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str537, ei_euc_jp},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 40 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str544, ei_utf16le},
+    {-1}, {-1},
+#line 229 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str547, ei_mulelao},
+    {-1}, {-1}, {-1}, {-1},
+#line 43 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str552, ei_utf32le},
+    {-1}, {-1}, {-1}, {-1}, {-1},
+#line 209 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str558, ei_mac_centraleurope},
+#line 50 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str559, ei_ucs4swapped},
+    {-1},
+#line 240 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str561, ei_cp874},
+    {-1},
+#line 15 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str563, ei_ascii},
+    {-1}, {-1},
+#line 36 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str566, ei_ucs4be},
+    {-1}, {-1},
+#line 293 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str569, ei_sjis},
+    {-1},
+#line 265 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str571, ei_jisx0212},
+    {-1}, {-1}, {-1}, {-1}, {-1},
+#line 187 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str577, ei_cp1256},
+#line 110 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str578, ei_iso8859_7},
+    {-1}, {-1},
+#line 39 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str581, ei_utf16be},
+    {-1}, {-1}, {-1}, {-1}, {-1},
+#line 254 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str587, ei_jisx0201},
+    {-1},
+#line 42 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str589, ei_utf32be},
+    {-1},
+#line 52 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str591, ei_java},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 253 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str600, ei_jisx0201},
+    {-1}, {-1}, {-1},
+#line 117 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str604, ei_iso8859_8},
+    {-1},
+#line 292 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str606, ei_sjis},
+    {-1}, {-1}, {-1}, {-1}, {-1},
+#line 257 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str612, ei_jisx0208},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
     {-1},
-#line 256 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str646, ei_jisx0208},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 293 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str663, ei_sjis},
-#line 263 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str664, ei_jisx0212},
-#line 214 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str665, ei_mac_hebrew},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 289 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str675, ei_sjis},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 244 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str685, ei_tcvn},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 178 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str694, ei_cp1254},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 264 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str623, ei_jisx0208},
+#line 267 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str624, ei_jisx0212},
     {-1}, {-1}, {-1}, {-1},
-#line 213 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str717, ei_mac_turkish},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1},
-#line 209 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str731, ei_mac_romania},
+#line 258 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str629, ei_jisx0208},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 184 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str750, ei_cp1256},
+    {-1}, {-1}, {-1},
+#line 247 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str651, ei_tcvn},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
     {-1}, {-1},
-#line 52 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str753, ei_java},
+#line 296 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str663, ei_sjis},
+#line 259 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str664, ei_jisx0208},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 214 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str683, ei_mac_ukraine},
+    {-1}, {-1}, {-1}, {-1},
+#line 295 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str688, ei_sjis},
+#line 256 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str689, ei_jisx0201},
+    {-1}, {-1}, {-1}, {-1},
+#line 335 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str694, ei_johab},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+    {-1}, {-1}, {-1}, {-1},
+#line 196 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str708, ei_cp850},
+    {-1}, {-1}, {-1}, {-1},
+#line 266 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str713, ei_jisx0212},
+#line 329 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str714, ei_big5hkscs},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+    {-1}, {-1}, {-1},
+#line 328 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str727, ei_big5hkscs},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 292 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str798, ei_sjis},
-#line 330 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str799, ei_johab},
+#line 215 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str764, ei_mac_greek},
+    {-1}, {-1}, {-1}, {-1}, {-1},
+#line 181 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str770, ei_cp1254},
+#line 178 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str771, ei_cp1253},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+    {-1},
+#line 324 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str791, ei_ces_big5},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+    {-1}, {-1}, {-1},
+#line 323 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str804, ei_ces_big5},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 187 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str879, ei_cp1257}
+#line 216 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str821, ei_mac_turkish},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+    {-1}, {-1}, {-1},
+#line 190 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str843, ei_cp1257},
+#line 217 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str844, ei_mac_hebrew},
+    {-1}, {-1}, {-1}, {-1},
+#line 291 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str849, ei_euc_jp}
   };
 
 #ifdef __GNUC__
diff --git a/man/iconv.3.html b/man/iconv.3.html
index d36f427..b218a01 100644
--- a/man/iconv.3.html
+++ b/man/iconv.3.html
@@ -16,8 +16,8 @@
 <a href="#SEE ALSO">SEE ALSO</a><br>
 
 <hr>
-<!-- Creator     : groff version 1.17 -->
-<!-- CreationDate: Fri Feb 14 19:23:41 2003 -->
+<!-- Creator     : groff version 1.17.2 -->
+<!-- CreationDate: Thu Jan 22 11:48:25 2004 -->
 <a name="NAME"></a>
 <h2>NAME</h2>
 <table width="100%" border=0 rules="none" frame="void"
@@ -147,7 +147,7 @@
 The <b>iconv</b> function returns the number of characters
 converted in a non-reversible way during this call;
 reversible conversions are not counted. In case of error, it
-sets <b>errno</b> and returns (iconv_t)(-1).</td></table>
+sets <b>errno</b> and returns (size_t)(-1).</td></table>
 <a name="ERRORS"></a>
 <h2>ERRORS</h2>
 
diff --git a/po/Makefile.msvc b/po/Makefile.msvc
index 102ed04..5442d7e 100644
--- a/po/Makefile.msvc
+++ b/po/Makefile.msvc
@@ -49,6 +49,9 @@
 	-mkdir $(localedir)\es
 	-mkdir $(localedir)\es\LC_MESSAGES
 	$(INSTALL_DATA) es.gmo $(localedir)\es\LC_MESSAGES\libiconv.mo
+	-mkdir $(localedir)\et
+	-mkdir $(localedir)\et\LC_MESSAGES
+	$(INSTALL_DATA) et.gmo $(localedir)\et\LC_MESSAGES\libiconv.mo
 	-mkdir $(localedir)\fi
 	-mkdir $(localedir)\fi\LC_MESSAGES
 	$(INSTALL_DATA) fi.gmo $(localedir)\fi\LC_MESSAGES\libiconv.mo
@@ -73,6 +76,12 @@
 	-mkdir $(localedir)\it
 	-mkdir $(localedir)\it\LC_MESSAGES
 	$(INSTALL_DATA) it.gmo $(localedir)\it\LC_MESSAGES\libiconv.mo
+	-mkdir $(localedir)\nl
+	-mkdir $(localedir)\nl\LC_MESSAGES
+	$(INSTALL_DATA) nl.gmo $(localedir)\nl\LC_MESSAGES\libiconv.mo
+	-mkdir $(localedir)\pl
+	-mkdir $(localedir)\pl\LC_MESSAGES
+	$(INSTALL_DATA) pl.gmo $(localedir)\pl\LC_MESSAGES\libiconv.mo
 	-mkdir $(localedir)\pt_BR
 	-mkdir $(localedir)\pt_BR\LC_MESSAGES
 	$(INSTALL_DATA) pt_BR.gmo $(localedir)\pt_BR\LC_MESSAGES\libiconv.mo
@@ -88,6 +97,9 @@
 	-mkdir $(localedir)\sl
 	-mkdir $(localedir)\sl\LC_MESSAGES
 	$(INSTALL_DATA) sl.gmo $(localedir)\sl\LC_MESSAGES\libiconv.mo
+	-mkdir $(localedir)\sr
+	-mkdir $(localedir)\sr\LC_MESSAGES
+	$(INSTALL_DATA) sr.gmo $(localedir)\sr\LC_MESSAGES\libiconv.mo
 	-mkdir $(localedir)\sv
 	-mkdir $(localedir)\sv\LC_MESSAGES
 	$(INSTALL_DATA) sv.gmo $(localedir)\sv\LC_MESSAGES\libiconv.mo
@@ -97,6 +109,12 @@
 	-mkdir $(localedir)\uk
 	-mkdir $(localedir)\uk\LC_MESSAGES
 	$(INSTALL_DATA) uk.gmo $(localedir)\uk\LC_MESSAGES\libiconv.mo
+	-mkdir $(localedir)\wa
+	-mkdir $(localedir)\wa\LC_MESSAGES
+	$(INSTALL_DATA) wa.gmo $(localedir)\wa\LC_MESSAGES\libiconv.mo
+	-mkdir $(localedir)\zh_CN
+	-mkdir $(localedir)\zh_CN\LC_MESSAGES
+	$(INSTALL_DATA) zh_CN.gmo $(localedir)\zh_CN\LC_MESSAGES\libiconv.mo
 
 installdirs : force
 	-mkdir $(prefix)
@@ -112,6 +130,8 @@
 	-mkdir $(localedir)\eo\LC_MESSAGES
 	-mkdir $(localedir)\es
 	-mkdir $(localedir)\es\LC_MESSAGES
+	-mkdir $(localedir)\et
+	-mkdir $(localedir)\et\LC_MESSAGES
 	-mkdir $(localedir)\fi
 	-mkdir $(localedir)\fi\LC_MESSAGES
 	-mkdir $(localedir)\fr
@@ -128,6 +148,10 @@
 	-mkdir $(localedir)\id\LC_MESSAGES
 	-mkdir $(localedir)\it
 	-mkdir $(localedir)\it\LC_MESSAGES
+	-mkdir $(localedir)\nl
+	-mkdir $(localedir)\nl\LC_MESSAGES
+	-mkdir $(localedir)\pl
+	-mkdir $(localedir)\pl\LC_MESSAGES
 	-mkdir $(localedir)\pt_BR
 	-mkdir $(localedir)\pt_BR\LC_MESSAGES
 	-mkdir $(localedir)\ro
@@ -138,12 +162,18 @@
 	-mkdir $(localedir)\sk\LC_MESSAGES
 	-mkdir $(localedir)\sl
 	-mkdir $(localedir)\sl\LC_MESSAGES
+	-mkdir $(localedir)\sr
+	-mkdir $(localedir)\sr\LC_MESSAGES
 	-mkdir $(localedir)\sv
 	-mkdir $(localedir)\sv\LC_MESSAGES
 	-mkdir $(localedir)\tr
 	-mkdir $(localedir)\tr\LC_MESSAGES
 	-mkdir $(localedir)\uk
 	-mkdir $(localedir)\uk\LC_MESSAGES
+	-mkdir $(localedir)\wa
+	-mkdir $(localedir)\wa\LC_MESSAGES
+	-mkdir $(localedir)\zh_CN
+	-mkdir $(localedir)\zh_CN\LC_MESSAGES
 
 uninstall : force
 	$(RM) $(localedir)\ca\LC_MESSAGES\libiconv.mo
@@ -151,6 +181,7 @@
 	$(RM) $(localedir)\de\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\eo\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\es\LC_MESSAGES\libiconv.mo
+	$(RM) $(localedir)\et\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\fi\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\fr\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\ga\LC_MESSAGES\libiconv.mo
@@ -159,14 +190,19 @@
 	$(RM) $(localedir)\hu\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\id\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\it\LC_MESSAGES\libiconv.mo
+	$(RM) $(localedir)\nl\LC_MESSAGES\libiconv.mo
+	$(RM) $(localedir)\pl\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\pt_BR\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\ro\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\ru\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\sk\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\sl\LC_MESSAGES\libiconv.mo
+	$(RM) $(localedir)\sr\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\sv\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\tr\LC_MESSAGES\libiconv.mo
 	$(RM) $(localedir)\uk\LC_MESSAGES\libiconv.mo
+	$(RM) $(localedir)\wa\LC_MESSAGES\libiconv.mo
+	$(RM) $(localedir)\zh_CN\LC_MESSAGES\libiconv.mo
 
 check : all
 
diff --git a/po/ca.po b/po/ca.po
index bde9cc9..9e5f073 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-05-31 00:01+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -14,22 +14,17 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Forma d'ús: iconv [--binary] [-c] [-s] [-f codif-orig] [-t codif-dest]\n"
-"                  [fitxer ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Forma d'ús: iconv [-c] [-s] [-f codif-orig] [-t codif-dest] [fitxer ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "o:          iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -38,50 +33,57 @@
 "de còpia.  No hi ha CAP garantia; ni tan sols de COMERCIABILITAT o\n"
 "ADEQUACIÓ A UN PROPÒSIT PARTICULAR.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrit per %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: hi ha un caràcter o seqüència de desplaçament incompleta\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: no s'ha pogut convertir\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: error d'E/S\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: la conversió des de «%s» no és suportada\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: la conversió fins «%s» no és suportada\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: la conversió des de «%s» fins «%s» no és suportada\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(entrada estàndard)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: error d'E/S\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Forma d'ús: iconv [--binary] [-c] [-s] [-f codif-orig] [-t codif-dest]\n"
+#~ "                  [fitxer ...]"
diff --git a/po/da.po b/po/da.po
index 09d2109..2492ffb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv-1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-11-09 19:23+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -16,19 +16,16 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr "Brug: iconv [--binary] [-c] [-s] [-f frakode] [-t tilkode] [fil ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Brug: iconv [-c] [-s] [-f frakode] [-t tilkode] [fil ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "eller: iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -38,50 +35,56 @@
 "INGEN garanti; ikke engang for SALGBARHED eller EGNETHED FOR NOGET\n"
 "SÆRLIGT FORMÅL.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet af %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: ufuldstændigt tegn eller skiftesekvens\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: kan ikke konvertere\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: ind-/udskriftsfejl\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: konvertering fra %s understøttes ikke\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: konvertering til %s understøttes ikke\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: konvertering fra %s til %s understøttes ikke\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(standard ind)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: I/O-fejl\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Brug: iconv [--binary] [-c] [-s] [-f frakode] [-t tilkode] [fil ...]"
diff --git a/po/de.po b/po/de.po
index 90a6ccb..b400816 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNU libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-04-28 04:26+0200\n"
 "Last-Translator: Bruno Haible <bruno@clisp.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -16,23 +16,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Aufruf: iconv [--binary] [-c] [-s]\n"
-"              [-f AUSGANGS-KODIERUNG] [-t ZIEL-KODIERUNG] [DATEI ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Aufruf: iconv [-c] [-s] [-f AUSGANGS-KODIERUNG] [-t ZIEL-KODIERUNG] "
 "[DATEI ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "oder:   iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -41,50 +36,57 @@
 "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE "
 "ZWECKE.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: unvollständiges Zeichen oder unvollständige Umschaltfolge\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: Kann nicht umwandeln.\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: Ein-/Ausgabefehler\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: Umwandlung ausgehend von %s ist nicht unterstützt.\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: Umwandlung nach %s ist nicht unterstützt.\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: Umwandlung von %s nach %s ist nicht unterstützt.\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(Standard-Eingabe)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: Ein-/Ausgabefehler\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Aufruf: iconv [--binary] [-c] [-s]\n"
+#~ "              [-f AUSGANGS-KODIERUNG] [-t ZIEL-KODIERUNG] [DATEI ...]"
diff --git a/po/eo.po b/po/eo.po
index 4ed75f2..708b08b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-05-30 09:00+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -14,20 +14,16 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Uzado: iconv [--binary] [-c] [-s] [-f fontkodo] [-t celkodo] [dosiero ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uzado: iconv [-c] [-s] [-f fontkodo] [-t celkodo] [dosiero ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "aŭ:    iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -35,50 +31,56 @@
 "Ĉi tio estas libera programo; vidu la fonton por kopikondiĉoj. Estas NENIA\n"
 "garantio; eĉ ne por KOMERCA KVALITO aŭ ADEKVATECO POR DIFINITA CELO.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Verkita de %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: malkompleta signo aŭ reĝimŝanĝa kodo\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: ne povas konverti\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: leg/skrib-eraro\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: konvertado de %s ne disponata\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: konvertado al %s ne disponata\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: konvertado de %s al %s ne disponata\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(normala enigo)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: leg/skrib-eraro\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Uzado: iconv [--binary] [-c] [-s] [-f fontkodo] [-t celkodo] [dosiero ...]"
diff --git a/po/es.po b/po/es.po
index cd8c2f1..2a96109 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNU libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-06-20 17:00+0200\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -15,21 +15,16 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Modo de empleo: iconv [--binary] [-c] [-s] [-f desde] [-t hasta] "
-"[fichero ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Modo de empleo: iconv [-c] [-s] [-f desde] [-t hasta] [fichero ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "o bien: iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -38,50 +33,57 @@
 "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
 "FIN DETERMINADO.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: carácter o secuencia de desplazamiento incompleta\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: no se puede convertir\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: error de E/S\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: no se admite la conversión de `%s'\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "no se admite la conversión a `%s'\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: no se admite la conversión de `%s' a `%s'\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(entrada estándar)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: error de E/S\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Modo de empleo: iconv [--binary] [-c] [-s] [-f desde] [-t hasta] "
+#~ "[fichero ...]"
diff --git a/po/et.po b/po/et.po
index 4623cc6..55acd89 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2003-05-29 10:35+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -15,20 +15,16 @@
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Kasutamine: iconv [--binary] [-c] [-s] [-f koodist] [-t koodi] [fail ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Kasutamine: iconv [-c] [-s] [-f koodist] [-t koodi] [fail ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "või:    iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -37,50 +33,56 @@
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks, vastavalt seadustega\n"
 "lubatud piiridele.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Kirjutanud %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: mittetäielik sümbol või nihkejärjend\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: ei saa teisendada\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: S/V viga\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: teisendust tabelist %s ei toetata\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: teisendust tabelisse %s ei toetata\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: teisendust %s -> %s ei toetata\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(standardsisend)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: S/V viga\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Kasutamine: iconv [--binary] [-c] [-s] [-f koodist] [-t koodi] [fail ...]"
diff --git a/po/fi.po b/po/fi.po
index b404178..d990a9c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-07-05 13:43%z\n"
 "Last-Translator: Matti Koskimies <matti@apulanta.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -14,22 +14,17 @@
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Käyttö: iconv [--binary] [-c] [-s] [-f syöttökoodaus] [-t tuloskoodaus] "
-"[tiedosto ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Käyttö: iconv [-c] [-s] [-f syöttökoodaus] [-t tuloskoodaus] [tiedosto ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "tai:    iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -39,50 +34,57 @@
 "hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen.\n"
 "Katso GPL-lisenssistä lisää yksityiskohtia.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Kirjoittanut %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: epätäydellinen vaihto- tai merkkijono\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: ei voi muuntaa\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: I/O-virhe\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: muunnos %s-koodauksesta ei ole tuettu\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: muunnos %s-koodaukseen ei tuettu\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: muunnos %s-koodauksesta %s-koodaukseen ei ole tuettu\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(oletussyöte)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: I/O-virhe\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Käyttö: iconv [--binary] [-c] [-s] [-f syöttökoodaus] [-t tuloskoodaus] "
+#~ "[tiedosto ...]"
diff --git a/po/fr.po b/po/fr.po
index 3875ac2..1ad8436 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNU libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-08-08 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -14,21 +14,16 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Usage: iconv [--binary] [-c] [-s] [-f code_source] [-t code_cible] "
-"[fichier ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Usage: iconv [-c] [-s] [-f code_source] [-t code_cible] [fichier ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "ou:    iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -37,50 +32,57 @@
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit pas %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: caractère incomplet ou séquence de décalage\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: ne peut convertir\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: ERREUR E/S\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: conversion à partir de %s non supportée\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: conversion vers %s non supportée\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: conversion à partir de %s vers %s non supportée\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: ERREUR E/S\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f code_source] [-t code_cible] "
+#~ "[fichier ...]"
diff --git a/po/ga.po b/po/ga.po
index 0208524..8015303 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2003-05-06 14:58-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -15,19 +15,16 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr "Úsáid: iconv [--binary] [-c] [-s] [-f cód] [-t cód] [comhad ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Úsáid: iconv [-c] [-s] [-f cód] [-t cód] [comhad ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "nó:    iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -36,50 +33,55 @@
 "coinníollacha cóipeála.  Níl baránta ar bith ann; go fiú níl baránta ann\n"
 "d'INDÍOLTACHT nó FEILIÚNACHT DO FHEIDHM AR LEITH.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Le %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: seicheamh neamhiomlán\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: ní féidir tiontú a dhéanamh\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: Earráid I/A\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: níl tiontú ó %s ar fáil\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: níl tiontú chuig %s ar fáil\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: níl tiontú ó %s chuig %s ar fáil\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: Earráid I/A\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr "Úsáid: iconv [--binary] [-c] [-s] [-f cód] [-t cód] [comhad ...]"
diff --git a/po/gl.po b/po/gl.po
index 916785d..620d9f8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-05-30 12:06+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -14,20 +14,16 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Emprego: iconv [--binary] [-c] [-s] [-f decodigo] [-t acodigo] [ficheiro ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Emprego: iconv [-c] [-s] [-f decodigo] [-t acodigo] [ficheiro ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "ou:      iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -37,50 +33,57 @@
 "garantía; nin sequera de COMERCIABILIDADE ou APTITUDE PARA UN FIN "
 "DETERMINADO.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: secuencia de caracteres ou desprazamentos incompleta\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: non se pode converter\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: erro de E/S\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: conversión de %s non soportada\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: conversión a %s non soportada\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: conversión de %s a %s non soportada\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(entrada estándar)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: erro de E/S\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Emprego: iconv [--binary] [-c] [-s] [-f decodigo] [-t acodigo] "
+#~ "[ficheiro ...]"
diff --git a/po/hr.po b/po/hr.po
index 764718f..a518c8a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-06-14 14:48-01\n"
 "Last-Translator: Denis Lackovic <delacko@fly.srk.fer.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -18,20 +18,16 @@
 "Plural-Forms: nplurals=2; plural=(n==1?0:1);\n"
 "X-Generator: TransDict server\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Uporaba: iconv [--binary] [-c] [-s] [-f izkoda] [-t ukod] [datoteka ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uporaba: iconv [-c] [-s] [-f izkoda] [-t ukod] [datoteka ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "ili:    iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -40,50 +36,56 @@
 "kopiranja.  NEMA\n"
 "garancije; čak ni tvrdnje o ISPLATIVOSTI ili POGODNOSTI ZA NEKU SVRHU.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napisao %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: nezavršena znakovna ili shift sekvenca\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: ne mogu konvertirati\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: U/I greška\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: konverzija iz %s nije podržana\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: konverzija u %s nije podržana\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: konverzija iz %s u %s nije podržana\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: U/I greška\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Uporaba: iconv [--binary] [-c] [-s] [-f izkoda] [-t ukod] [datoteka ...]"
diff --git a/po/hu.po b/po/hu.po
index b663a30..8b972e8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-05-30 14:26+0200\n"
 "Last-Translator: Emese Kovacs <emese@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -15,21 +15,16 @@
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Használat: iconv [--binary] [-c] [-s] [-f kódolásról] [-t kódolásra] "
-"[fájl ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Használat: iconv [-c] [-s] [-f kódolásról] [-t kódolásra] [fájl ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "vagy:    iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -39,52 +34,59 @@
 "SEMMILYEN garanciát nem vállalunk, még azt sem állítjuk, hogy ez a program\n"
 "KERESKEDELMI CÉLOKRA ALKALMAS vagy HASZNÁLHATÓ EGY ADOTT FELADATRA.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Írta %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: nem egész karakter vagy eltolási szekvencia\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: konvertálás sikertelen\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: I/O hiba\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: a konvertálás errõl a kódolásról (%s) nem támogatott\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: a konvertálás erre a kódolásra (%s) nem támogatott\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr ""
 "iconv: a konvertálás errõl a kódolásról (%s)\n"
 "erre a kódlásra (%s) nem támogatott\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: I/O hiba\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Használat: iconv [--binary] [-c] [-s] [-f kódolásról] [-t kódolásra] "
+#~ "[fájl ...]"
diff --git a/po/id.po b/po/id.po
index 3c76065..ad25715 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-10-15 15:22GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -17,20 +17,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Penggunaan: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Penggunaan: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "atau:    iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -38,50 +34,57 @@
 "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"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: karakter atau urutan shift tidak lengkap\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: tidak dapat mengkonversi\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: kesalahan I/O\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: konversi dari %s tidak didukung\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: konversi ke %s tidak didukung\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: konversi dari %s to %s tidak didukung\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: kesalahan I/O\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Penggunaan: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] "
+#~ "[file ...]"
diff --git a/po/it.po b/po/it.po
index 9ec230c..8db9814 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-12-02 23:06+0100\n"
 "Last-Translator: Marco Parrone <marc0@autistici.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -14,19 +14,16 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr "Uso: iconv [--binary] [-c] [-s] [-f dacodice] [-t acodice] [file ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uso: iconv [-c] [-s] [-f dacodice] [-t acodice] [file ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "o:   iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -37,50 +34,56 @@
 "NON c'è alcuna garanzia; neanche di COMMERCIABILITÀ o APPLICABILITÀ PER UNO\n"
 "SCOPO PARTICOLARE.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scritto da %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: carattere o sequenza di modificatori incompleta\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: non è possibile convertire\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: errore di I/O\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: la conversione da %s non è supportata\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: la conversione verso %s non è supportata\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: la conversione da %s verso %s non è supportata\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: errore di I/O\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Uso: iconv [--binary] [-c] [-s] [-f dacodice] [-t acodice] [file ...]"
diff --git a/po/libiconv.pot b/po/libiconv.pot
index e3f73be..5a26205 100644
--- a/po/libiconv.pot
+++ b/po/libiconv.pot
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\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"
@@ -16,68 +16,66 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr ""
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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 ""
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr ""
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr ""
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr ""
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr ""
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr ""
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr ""
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr ""
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr ""
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 9799d3e..4e02320 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2003-08-04 22:20+0100\n"
 "Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -16,20 +16,16 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Gebruik: iconv [--binary] [-c] [-s] [-f vancode] [-t naarcode] [bestand ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Gebruik: iconv [-c] [-s] [-f vancode] [-t naarcode] [bestand ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "of:    iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -37,50 +33,57 @@
 "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"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: incompleet teken of verschuivingsreeks\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: kan niet converteren\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: I/O fout\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: conversie van %s niet ondersteund\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: conversie naar %s niet ondersteund\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: conversie van %s naar %s niet ondersteund\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: I/O fout\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Gebruik: iconv [--binary] [-c] [-s] [-f vancode] [-t naarcode] "
+#~ "[bestand ...]"
diff --git a/po/pl.po b/po/pl.po
index e713060..5b430bc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2003-10-13 22:56+0100\n"
 "Last-Translator: Arkadiusz Lipiec <A.Lipiec@elka.pw.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -15,19 +15,16 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr "U¿ycie: iconv [--binary] [-c] [-s] [-f z_kodu] [-t do_kodu] [plik ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "U¿ycie: iconv [-c] [-s] [f z_kodu] [-t do_kodu] [plik ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "lub:    iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -36,50 +33,56 @@
 "licencji. Na oprogramowanie to nie jest udzielana ¯ADNA GWARANCJA; nawet\n"
 "gwarancja RÊKOJMI lub PRZYDATNO¦CI DO OKRE¦LONEGO CELU.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napisane przez %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: niedokoñczony znak lub sekwencja shift\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: nie mo¿na skonwertowaæ\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: b³±d wej./wyj.\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: konwersja z kodu %s jest nieobs³ugiwana\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: konwersja do kodu %s jest nieobs³ugiwana\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: konwersja z kodu %s do kodu %s jest nieobs³ugiwana\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: b³±d wej./wyj.\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "U¿ycie: iconv [--binary] [-c] [-s] [-f z_kodu] [-t do_kodu] [plik ...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7e07353..cd46d51 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-07-22 03:50-0300\n"
 "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -16,20 +16,16 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Uso: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [arquivo ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uso: iconv [-c] [-s] [-f fromcode] [-t tocode] [arquivo ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "ou:  iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -40,50 +36,56 @@
 "ou\n"
 "ADEQUAÇÃO À QUALQUER FINALIDADE PARTICULAR.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: seqüência de caracteres ou deslocamentos incompleta\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: impossível converter\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: erro de E/S\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: conversão de %s não é suportada\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: conversão para %s não é suportada\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: conversão de %s para %s não é suportada\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: erro de E/S\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Uso: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [arquivo ...]"
diff --git a/po/ro.po b/po/ro.po
index 74624f2..09bf3b3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv-1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2003-05-17 15:15+0300\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -15,21 +15,16 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Folosire: iconv [--binary] [-c] [-s] [-f din_cod] [-t în_cod] [fiºier ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Folosire: iconv [-c] [-s] [-f din_cod] [-t în_cod] [fiºier ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "sau:   iconv -l"
 
-#: src/iconv.c:74
-#, fuzzy
+#: src/iconv.c:66
+#, fuzzy, c-format
 msgid ""
 "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"
@@ -38,50 +33,56 @@
 "existã nici o garanþie; nici mãcarVANDABILITATEA sau MODIFICAREA ÎNTR-UN\n"
 "SCOP PRIVAT.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scris de %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: caracter sau secvenþã de shift incomplete\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: nu pot converti\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: erori I/O\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: conversia din %s nu este suportatã\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: conversia în %s nu este suportatã\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: conversia din %s în %s nu este suportatã\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: eroare I/O\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Folosire: iconv [--binary] [-c] [-s] [-f din_cod] [-t în_cod] [fiºier ...]"
diff --git a/po/ru.po b/po/ru.po
index e36bdb3..5f25b3c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2003-06-03 17:53+0400\n"
 "Last-Translator: Dmitry S. Sivachenko <mitya@cavia.pp.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -16,21 +16,16 @@
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"éÓÐÏÌØÚÏ×ÁÎÉÅ: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] "
-"[ÆÁÊÌ ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: iconv [-c] [-s] [-f fromcode] [-t tocode] [ÆÁÊÌ ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "ÉÌÉ:   iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -40,50 +35,57 @@
 "ëïííåòþåóëïê\n"
 "ãåîîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ëïîëòåôîïê ãåìé.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "á×ÔÏÒÙ: %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: ÎÅÐÏÌÎÙÊ ÓÉÍ×ÏÌ ÉÌÉ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÓÄ×ÉÇÁ\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: ÎÅ ÕÄÁÅÔÓÑ ÐÒÅÏÂÒÁÚÏ×ÁÔØ\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: ÏÛÉÂËÁ ××ÏÄÁ-×Ù×ÏÄÁ\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÉÚ %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ × %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÉÚ %s × %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "incov: ÏÛÉÂËÁ ××ÏÄÁ-×Ù×ÏÄÁ\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "éÓÐÏÌØÚÏ×ÁÎÉÅ: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] "
+#~ "[ÆÁÊÌ ...]"
diff --git a/po/sk.po b/po/sk.po
index 131a699..86b8a51 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2003-09-05 07:05+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -14,20 +14,16 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Použitie: iconv [--binary] [-c] [-s] [-f z_kódu] [-t do_kódu] [súbor ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Použitie: iconv [-c] [-s] [-f z_kódu] [-t do kódu] [súbor ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "alebo:    iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -38,50 +34,56 @@
 "VHODNOSTI\n"
 "NA KONKRÉTNY ÚČEL.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napísal %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: nekompletný znak alebo preraďovacia sekvencia\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: nemôžem konvertovať\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: V/V chyba\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: konverzia z %s nie je podporovaná\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: konverzia do %s nie je podporovaná\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: konverzia z %s do %s nie je podporovaná\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(štandardný vstup)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: V/V chyba\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Použitie: iconv [--binary] [-c] [-s] [-f z_kódu] [-t do_kódu] [súbor ...]"
diff --git a/po/sl.po b/po/sl.po
index 8a825ab..e2469df 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-08-13 15:09+0200\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -16,21 +16,16 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Uporaba: iconv [--binary] [-c] [-s] [-f vh_nabor] [-t izh_nabor] "
-"[datoteka ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uporaba: iconv [-c] [-s] [-f vh_nabor] [-t izh_nabor] [datoteka ...]<"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "ali:   iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -39,50 +34,57 @@
 "raz¹irjate, so navedeni v izvorni kodi. Za program ni NOBENEGA jamstva,\n"
 "niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA UPORABO.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Avtor %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: nepopolni znak ali pomièno zaporedje\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: pretvorba ni mogoèa\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: V/I napaka\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: pretvorba iz nabora %s ni podprta\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: pretvorba v nabor %s ni podprta\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: pretvorba iz nabora %s v nabor %s ni podprta\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: V/I napaka\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Uporaba: iconv [--binary] [-c] [-s] [-f vh_nabor] [-t izh_nabor] "
+#~ "[datoteka ...]"
diff --git a/po/sr.po b/po/sr.po
index 7ebc06b..8bcf7b5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2003-11-13 14:36-0500\n"
 "Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -14,20 +14,16 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Употреба: iconv [--binary] [-c] [-s] [-f изкод] [-t укод] [датотека ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Употреба: iconv [-c] [-s] [-f изкод] [-t укод] [датотека ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "или:      iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -37,50 +33,56 @@
 "гаранција; чак ни о КОМЕРЦИЈАЛНОЈ ВРЕДНОСТИ или ИСПУЊАВАЊУ ОДРЕЂЕНЕ "
 "ПОТРЕБЕ.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Написао %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: непотпуни знаковни или шифт низ\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: не може претворити\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: У/И грешка\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: претварање из %s није подржано\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: претварање у %s није подржано\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: претварање из %s у %s није подржано\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(стдул)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: У/И грешка\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Употреба: iconv [--binary] [-c] [-s] [-f изкод] [-t укод] [датотека ...]"
diff --git a/po/sv.po b/po/sv.po
index 72ef208..37e4888 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv-1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-05-30 19:23+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,20 +16,16 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Användning: iconv [--binary] [-c] [-s] [-f frånkod] [-t tillkod] [fil ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Användning: iconv [-c] [-s] [-f frånkod] [-t tillkod] [fil ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "eller: iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -38,50 +34,56 @@
 "INGEN garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT\n"
 "SPECIELLT ÄNDAMÅL.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrivet av %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: ofullständigt tecken eller skiftsekvens\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: kan inte konvertera\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: in-/utmatningsfel\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: konvertering från %s stöds inte\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: konvertering till %s stöds inte\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: konvertering från %s till %s stöds inte\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(standard in)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: I/O-fel\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Användning: iconv [--binary] [-c] [-s] [-f frånkod] [-t tillkod] [fil ...]"
diff --git a/po/tr.po b/po/tr.po
index 1ff0f07..9649d31 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2002-06-28 11:00+0200\n"
 "Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -16,20 +16,16 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Kullanım: iconv [--binary] [-c] [-s] [-f kaynakkod] [-t hedefkod] [dosya ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Kullanım: iconv [-c] [-s] [-f kaynakkod] [-t hedefkod] [dosya ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "veya:  iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -38,50 +34,57 @@
 "HİÇ BİR garantisi yoktur; hatta SATILABİLİRLİĞİ veya HERHANGİ BİR AMACA\n"
 "UYGUNLUĞU için dahi garanti verilmez.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Yazan: %s\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: eksik karakter ya da shift dizisi\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: dönüştürülemedi\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: I/O hatası\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: %s'den dönüşüm desteklenmiyor\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: %s'e dönüşüm desteklenmiyor\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: %s'den %s'e dönüşüm desteklenmiyor\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(standart girdi)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: I/O hatası\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Kullanım: iconv [--binary] [-c] [-s] [-f kaynakkod] [-t hedefkod] "
+#~ "[dosya ...]"
diff --git a/po/uk.po b/po/uk.po
index 6649672..c3cb8e9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2003-02-09 17:27+0200\n"
 "Last-Translator: Volodymyr M. Lisivka <lvm@mystery.lviv.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -14,22 +14,17 @@
 "Content-Type: text/plain; charset=KOI8-U\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"÷ÉËÏÒÉÓÔÁÎÎÑ:\n"
-"  iconv [--binary] [-c] [-s] [-f Ú_ËÏÄÕ×ÁÎÎÑ] [-t Õ_ËÏÄÕ×ÁÎÎÑ] [ÆÁÊÌ ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "÷ÉËÏÒÉÓÔÁÎÎÑ: iconv [-c] [-s] [-f Ú_ËÏÄÕ×ÁÎÎÑ] [-t Õ_ËÏÄÕ×ÁÎÎÑ] [ÆÁÊÌ ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "ÁÂÏ:   iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -39,50 +34,57 @@
 "ëïíåòã¶êîï·\n"
 "ã¶îîïóô¶ ÁÂÏ ðòéäáôîïóô¶ äìñ ëïîëòåôîï· ã¶ì¶.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "á×ÔÏÒ: %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: ÎÅÚÁ×ÅÒÛÅÎÉÊ ÓÉÍ×ÏÌ ÞÉ ÐÏÓ̦ÄÏ×ΦÓÔØ ÚͦÎÉ ÒÅǦÓÔÒÕ\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: ÎÅ ×ÄÁÌÏÓÑ ÐÅÒÅÔ×ÏÒÉÔÉ\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: ÐÏÍÉÌËÁ ÷/÷\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: ÐÅÒÅÔ×ÏÒÅÎÎÑ Ú %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: ÐÅÒÅÔ×ÏÒÅÎÎÑ Õ %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: ÐÅÒÅÔ×ÏÒÅÎÎÑ Ú %s Õ %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(ÓÔÄ. ×צÄ)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "incov: ÐÏÍÉÌËÁ ÷/÷\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "÷ÉËÏÒÉÓÔÁÎÎÑ:\n"
+#~ "  iconv [--binary] [-c] [-s] [-f Ú_ËÏÄÕ×ÁÎÎÑ] [-t Õ_ËÏÄÕ×ÁÎÎÑ] [ÆÁÊÌ ...]"
diff --git a/po/wa.po b/po/wa.po
index 1eb658b..4a63aa5 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2003-06-26 20:08+0100\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -13,22 +13,17 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr ""
-"Po s' è siervi: iconv [--binary] [-c] [-s] [-f ecôd._sourd] [-t ecôd._såme] "
-"[fitchî...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Po s' è siervi: iconv [-c] [-s] [-f ecôd._sourd] [-t ecôd._såme] [fitchî...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "oudonbén:       iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -38,50 +33,57 @@
 "I n' a NOLE WAERANTEYE; nén minme ki vos VINDRÎZ bén\n"
 "li programe ou ki vos vs è SIEVRÎZ BÉN PO ENE SÔRE OU L' ÔTE.\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Sicrît pa %s.\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv: %s: caractere ou secwénce di candjmint nén complete\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv: %s: dji n' sai fé l' kiviersaedje\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv: %s: "
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv: %s: aroke d' intrêye/rexhowe\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv: li cviersaedje a pårti d' l' ecôdaedje %s n' est nén sopoirté\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv: li cviersaedje viè l' ecôdaedje %s n' est nén sopoirté\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv: li cviersaedje di l' ecôdaedje %s viè %s n' est nén sopoirté\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(intrêye sitandård)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv: aroke d' intrêye/rexhowe\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "Po s' è siervi: iconv [--binary] [-c] [-s] [-f ecôd._sourd] [-t ecôd."
+#~ "_såme] [fitchî...]"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bd173f6..07c625e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2003-05-06 13:32+0200\n"
+"POT-Creation-Date: 2004-01-22 11:54+0100\n"
 "PO-Revision-Date: 2003-06-01 23:55+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -15,19 +15,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/iconv.c:59
-msgid "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-msgstr "用法:iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-
-#: src/iconv.c:61
+#: src/iconv.c:54
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "用法:iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 
-#: src/iconv.c:64
+#: src/iconv.c:56
 msgid "or:    iconv -l"
 msgstr "或:  iconv -l"
 
-#: src/iconv.c:74
+#: src/iconv.c:66
+#, c-format
 msgid ""
 "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"
@@ -35,50 +32,56 @@
 "这是自由软件;请查看源代码中的复制条件。本软件不提供任何担保,包括销售\n"
 "或者适用性担保。\n"
 
-#: src/iconv.c:77
+#: src/iconv.c:69
 #, c-format
 msgid "Written by %s.\n"
 msgstr "作者 %s。\n"
 
-#: src/iconv.c:114 src/iconv.c:146 src/iconv.c:196
+#: src/iconv.c:105 src/iconv.c:137 src/iconv.c:187
 #, c-format
 msgid "iconv: %s: incomplete character or shift sequence\n"
 msgstr "iconv:%s:不完整的字符或者换码序列\n"
 
-#: src/iconv.c:140 src/iconv.c:191
+#: src/iconv.c:131 src/iconv.c:182
 #, c-format
 msgid "iconv: %s: cannot convert\n"
 msgstr "iconv:%s:无法转换\n"
 
-#: src/iconv.c:162 src/iconv.c:201 src/iconv.c:320
+#: src/iconv.c:153 src/iconv.c:192 src/iconv.c:310
 #, c-format
 msgid "iconv: %s: "
 msgstr "iconv:%s:"
 
-#: src/iconv.c:210
+#: src/iconv.c:201
 #, c-format
 msgid "iconv: %s: I/O error\n"
 msgstr "iconv:%s:输入输出错误\n"
 
-#: src/iconv.c:304
+#: src/iconv.c:294
 #, c-format
 msgid "iconv: conversion from %s unsupported\n"
 msgstr "iconv:不支持从 %s 进行转换\n"
 
-#: src/iconv.c:306
+#: src/iconv.c:296
 #, c-format
 msgid "iconv: conversion to %s unsupported\n"
 msgstr "iconv:不支持转换到 %s\n"
 
-#: src/iconv.c:308
+#: src/iconv.c:298
 #, c-format
 msgid "iconv: conversion from %s to %s unsupported\n"
 msgstr "iconv:不支持从 %s 转换到 %s\n"
 
-#: src/iconv.c:312
+#: src/iconv.c:302
 msgid "(stdin)"
 msgstr "(标准输入)"
 
-#: src/iconv.c:333
+#: src/iconv.c:323
+#, c-format
 msgid "iconv: I/O error\n"
 msgstr "iconv:输入输出错误\n"
+
+#~ msgid ""
+#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+#~ msgstr ""
+#~ "用法:iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
diff --git a/srclib/Makefile.in b/srclib/Makefile.in
index d75bb5e..eb76cd8 100644
--- a/srclib/Makefile.in
+++ b/srclib/Makefile.in
@@ -180,7 +180,7 @@
 # Woe32 support.
 EXTRA_DIST = \
   $(LIBADD_SOURCE) relocwrapper.c\
-stdbool.h.in alloca_.h Makefile.msvc
+stdbool_.h alloca_.h Makefile.msvc
 MOSTLYCLEANFILES = stdbool.h alloca.h
 
 RM = rm -f
@@ -205,6 +205,7 @@
   alloca.c \
   canonicalize.h canonicalize.c \
   memmove.c \
+  readlink.c \
   relocatable.h relocatable.c \
   setenv.h setenv.c unsetenv.c \
   strerror.c
@@ -241,7 +242,7 @@
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(libicrt_a_SOURCES)
 DIST_COMMON = Makefile.am Makefile.in alloca.c canonicalize.c memmove.c \
-	relocatable.c setenv.c strerror.c unsetenv.c
+	readlink.c relocatable.c setenv.c strerror.c unsetenv.c
 SOURCES = $(libicrt_a_SOURCES)
 
 all: all-am
@@ -463,8 +464,8 @@
 # The following is needed in order to create an <stdbool.h> when the system
 # doesn't have one that works.
 all-local $(libicrt_a_OBJECTS): @STDBOOL_H@
-stdbool.h: stdbool.h.in
-	sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' < $(srcdir)/stdbool.h.in > stdbool.h
+stdbool.h: stdbool_.h
+	sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' < $(srcdir)/stdbool_.h > stdbool.h
 
 # The following is needed in order to create an <alloca.h> when the system
 # doesn't have one that works with the given compiler.