--- /dev/null
+diff -uNr popt-1.6.4.orig/configure.in popt-1.6.4/configure.in
+--- popt-1.6.4.orig/configure.in Mon Dec 3 21:46:28 2001
++++ popt-1.6.4/configure.in Tue Sep 2 01:44:51 2003
+@@ -3,7 +3,7 @@
+ AC_PREREQ(2.12)
+ AC_CANONICAL_SYSTEM
+ AM_INIT_AUTOMAKE(popt, 1.6.4)
+-ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
++ALL_LINGUAS="cs da es gl hu is ko no pt ro ru sk sl sv tr uk wa zh_CN"
+
+ AC_ISC_POSIX
+
+diff -uNr popt-1.6.4.orig/po/de.po popt-1.6.4/po/de.po
+--- popt-1.6.4.orig/po/de.po Fri Feb 15 00:58:34 2002
++++ popt-1.6.4/po/de.po Thu Jan 1 01:00:00 1970
+@@ -1,116 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: popt 1.6.3\n"
+-"POT-Creation-Date: 2002-01-19 09:14-0500\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"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
+-
+-#: popt.c:29
+-msgid "unknown errno"
+-msgstr ""
+-
+-#: popt.c:917
+-#, c-format
+-msgid "option type (%d) not implemented in popt\n"
+-msgstr ""
+-
+-#: popt.c:1132
+-msgid "missing argument"
+-msgstr ""
+-
+-#: popt.c:1134
+-msgid "unknown option"
+-msgstr ""
+-
+-#: popt.c:1136
+-msgid "mutually exclusive logical operations requested"
+-msgstr ""
+-
+-#: popt.c:1138
+-msgid "opt->arg should not be NULL"
+-msgstr ""
+-
+-#: popt.c:1140
+-msgid "aliases nested too deeply"
+-msgstr ""
+-
+-#: popt.c:1142
+-msgid "error in parameter quoting"
+-msgstr ""
+-
+-#: popt.c:1144
+-msgid "invalid numeric value"
+-msgstr ""
+-
+-#: popt.c:1146
+-msgid "number too large or too small"
+-msgstr ""
+-
+-#: popt.c:1148
+-msgid "memory allocation failed"
+-msgstr ""
+-
+-#: popt.c:1152
+-msgid "unknown error"
+-msgstr ""
+-
+-#: popthelp.c:53
+-msgid "Show this help message"
+-msgstr ""
+-
+-#: popthelp.c:54
+-msgid "Display brief usage message"
+-msgstr ""
+-
+-#: popthelp.c:57
+-msgid "Display option defaults in message"
+-msgstr ""
+-
+-#: popthelp.c:99
+-msgid "NONE"
+-msgstr ""
+-
+-#: popthelp.c:100
+-msgid "VAL"
+-msgstr ""
+-
+-#: popthelp.c:101
+-msgid "INT"
+-msgstr ""
+-
+-#: popthelp.c:102
+-msgid "LONG"
+-msgstr ""
+-
+-#: popthelp.c:103
+-msgid "STRING"
+-msgstr ""
+-
+-#: popthelp.c:104
+-msgid "FLOAT"
+-msgstr ""
+-
+-#: popthelp.c:105
+-msgid "DOUBLE"
+-msgstr ""
+-
+-#: popthelp.c:106
+-msgid "ARG"
+-msgstr ""
+-
+-#: popthelp.c:459
+-msgid "Usage:"
+-msgstr ""
+-
+-#: popthelp.c:481
+-msgid "[OPTION...]"
+-msgstr ""
+diff -uNr popt-1.6.4.orig/po/es.po popt-1.6.4/po/es.po
+--- popt-1.6.4.orig/po/es.po Fri Feb 15 00:58:34 2002
++++ popt-1.6.4/po/es.po Tue Sep 2 01:43:13 2003
+@@ -2,17 +2,16 @@
+ # Copyright (C) YEAR Free Software Foundation, Inc.
+ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+ #
+-#, fuzzy
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: popt 1.6.3\n"
+ "POT-Creation-Date: 2002-01-19 09:14-0500\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
+-"Language-Team: LANGUAGE <LL@li.org>\n"
++"Language-Team: Spanish\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
+
+ #: popt.c:29
+ msgid "unknown errno"
+diff -uNr popt-1.6.4.orig/po/eu_ES.po popt-1.6.4/po/eu_ES.po
+--- popt-1.6.4.orig/po/eu_ES.po Fri Feb 15 00:58:34 2002
++++ popt-1.6.4/po/eu_ES.po Thu Jan 1 01:00:00 1970
+@@ -1,116 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: popt 1.6.3\n"
+-"POT-Creation-Date: 2002-01-19 09:14-0500\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"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
+-
+-#: popt.c:29
+-msgid "unknown errno"
+-msgstr ""
+-
+-#: popt.c:917
+-#, c-format
+-msgid "option type (%d) not implemented in popt\n"
+-msgstr ""
+-
+-#: popt.c:1132
+-msgid "missing argument"
+-msgstr ""
+-
+-#: popt.c:1134
+-msgid "unknown option"
+-msgstr ""
+-
+-#: popt.c:1136
+-msgid "mutually exclusive logical operations requested"
+-msgstr ""
+-
+-#: popt.c:1138
+-msgid "opt->arg should not be NULL"
+-msgstr ""
+-
+-#: popt.c:1140
+-msgid "aliases nested too deeply"
+-msgstr ""
+-
+-#: popt.c:1142
+-msgid "error in parameter quoting"
+-msgstr ""
+-
+-#: popt.c:1144
+-msgid "invalid numeric value"
+-msgstr ""
+-
+-#: popt.c:1146
+-msgid "number too large or too small"
+-msgstr ""
+-
+-#: popt.c:1148
+-msgid "memory allocation failed"
+-msgstr ""
+-
+-#: popt.c:1152
+-msgid "unknown error"
+-msgstr ""
+-
+-#: popthelp.c:53
+-msgid "Show this help message"
+-msgstr ""
+-
+-#: popthelp.c:54
+-msgid "Display brief usage message"
+-msgstr ""
+-
+-#: popthelp.c:57
+-msgid "Display option defaults in message"
+-msgstr ""
+-
+-#: popthelp.c:99
+-msgid "NONE"
+-msgstr ""
+-
+-#: popthelp.c:100
+-msgid "VAL"
+-msgstr ""
+-
+-#: popthelp.c:101
+-msgid "INT"
+-msgstr ""
+-
+-#: popthelp.c:102
+-msgid "LONG"
+-msgstr ""
+-
+-#: popthelp.c:103
+-msgid "STRING"
+-msgstr ""
+-
+-#: popthelp.c:104
+-msgid "FLOAT"
+-msgstr ""
+-
+-#: popthelp.c:105
+-msgid "DOUBLE"
+-msgstr ""
+-
+-#: popthelp.c:106
+-msgid "ARG"
+-msgstr ""
+-
+-#: popthelp.c:459
+-msgid "Usage:"
+-msgstr ""
+-
+-#: popthelp.c:481
+-msgid "[OPTION...]"
+-msgstr ""
+diff -uNr popt-1.6.4.orig/po/fi.po popt-1.6.4/po/fi.po
+--- popt-1.6.4.orig/po/fi.po Fri Feb 15 00:58:34 2002
++++ popt-1.6.4/po/fi.po Thu Jan 1 01:00:00 1970
+@@ -1,116 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: popt 1.6.3\n"
+-"POT-Creation-Date: 2002-01-19 09:14-0500\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"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
+-
+-#: popt.c:29
+-msgid "unknown errno"
+-msgstr ""
+-
+-#: popt.c:917
+-#, c-format
+-msgid "option type (%d) not implemented in popt\n"
+-msgstr ""
+-
+-#: popt.c:1132
+-msgid "missing argument"
+-msgstr ""
+-
+-#: popt.c:1134
+-msgid "unknown option"
+-msgstr ""
+-
+-#: popt.c:1136
+-msgid "mutually exclusive logical operations requested"
+-msgstr ""
+-
+-#: popt.c:1138
+-msgid "opt->arg should not be NULL"
+-msgstr ""
+-
+-#: popt.c:1140
+-msgid "aliases nested too deeply"
+-msgstr ""
+-
+-#: popt.c:1142
+-msgid "error in parameter quoting"
+-msgstr ""
+-
+-#: popt.c:1144
+-msgid "invalid numeric value"
+-msgstr ""
+-
+-#: popt.c:1146
+-msgid "number too large or too small"
+-msgstr ""
+-
+-#: popt.c:1148
+-msgid "memory allocation failed"
+-msgstr ""
+-
+-#: popt.c:1152
+-msgid "unknown error"
+-msgstr ""
+-
+-#: popthelp.c:53
+-msgid "Show this help message"
+-msgstr ""
+-
+-#: popthelp.c:54
+-msgid "Display brief usage message"
+-msgstr ""
+-
+-#: popthelp.c:57
+-msgid "Display option defaults in message"
+-msgstr ""
+-
+-#: popthelp.c:99
+-msgid "NONE"
+-msgstr ""
+-
+-#: popthelp.c:100
+-msgid "VAL"
+-msgstr ""
+-
+-#: popthelp.c:101
+-msgid "INT"
+-msgstr ""
+-
+-#: popthelp.c:102
+-msgid "LONG"
+-msgstr ""
+-
+-#: popthelp.c:103
+-msgid "STRING"
+-msgstr ""
+-
+-#: popthelp.c:104
+-msgid "FLOAT"
+-msgstr ""
+-
+-#: popthelp.c:105
+-msgid "DOUBLE"
+-msgstr ""
+-
+-#: popthelp.c:106
+-msgid "ARG"
+-msgstr ""
+-
+-#: popthelp.c:459
+-msgid "Usage:"
+-msgstr ""
+-
+-#: popthelp.c:481
+-msgid "[OPTION...]"
+-msgstr ""
+diff -uNr popt-1.6.4.orig/po/fr.po popt-1.6.4/po/fr.po
+--- popt-1.6.4.orig/po/fr.po Fri Feb 15 00:58:34 2002
++++ popt-1.6.4/po/fr.po Thu Jan 1 01:00:00 1970
+@@ -1,116 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: popt 1.6.3\n"
+-"POT-Creation-Date: 2002-01-19 09:14-0500\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"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
+-
+-#: popt.c:29
+-msgid "unknown errno"
+-msgstr ""
+-
+-#: popt.c:917
+-#, c-format
+-msgid "option type (%d) not implemented in popt\n"
+-msgstr ""
+-
+-#: popt.c:1132
+-msgid "missing argument"
+-msgstr ""
+-
+-#: popt.c:1134
+-msgid "unknown option"
+-msgstr ""
+-
+-#: popt.c:1136
+-msgid "mutually exclusive logical operations requested"
+-msgstr ""
+-
+-#: popt.c:1138
+-msgid "opt->arg should not be NULL"
+-msgstr ""
+-
+-#: popt.c:1140
+-msgid "aliases nested too deeply"
+-msgstr ""
+-
+-#: popt.c:1142
+-msgid "error in parameter quoting"
+-msgstr ""
+-
+-#: popt.c:1144
+-msgid "invalid numeric value"
+-msgstr ""
+-
+-#: popt.c:1146
+-msgid "number too large or too small"
+-msgstr ""
+-
+-#: popt.c:1148
+-msgid "memory allocation failed"
+-msgstr ""
+-
+-#: popt.c:1152
+-msgid "unknown error"
+-msgstr ""
+-
+-#: popthelp.c:53
+-msgid "Show this help message"
+-msgstr ""
+-
+-#: popthelp.c:54
+-msgid "Display brief usage message"
+-msgstr ""
+-
+-#: popthelp.c:57
+-msgid "Display option defaults in message"
+-msgstr ""
+-
+-#: popthelp.c:99
+-msgid "NONE"
+-msgstr ""
+-
+-#: popthelp.c:100
+-msgid "VAL"
+-msgstr ""
+-
+-#: popthelp.c:101
+-msgid "INT"
+-msgstr ""
+-
+-#: popthelp.c:102
+-msgid "LONG"
+-msgstr ""
+-
+-#: popthelp.c:103
+-msgid "STRING"
+-msgstr ""
+-
+-#: popthelp.c:104
+-msgid "FLOAT"
+-msgstr ""
+-
+-#: popthelp.c:105
+-msgid "DOUBLE"
+-msgstr ""
+-
+-#: popthelp.c:106
+-msgid "ARG"
+-msgstr ""
+-
+-#: popthelp.c:459
+-msgid "Usage:"
+-msgstr ""
+-
+-#: popthelp.c:481
+-msgid "[OPTION...]"
+-msgstr ""
+diff -uNr popt-1.6.4.orig/po/id.po popt-1.6.4/po/id.po
+--- popt-1.6.4.orig/po/id.po Fri Feb 15 00:58:34 2002
++++ popt-1.6.4/po/id.po Thu Jan 1 01:00:00 1970
+@@ -1,116 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: popt 1.6.3\n"
+-"POT-Creation-Date: 2002-01-19 09:14-0500\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"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
+-
+-#: popt.c:29
+-msgid "unknown errno"
+-msgstr ""
+-
+-#: popt.c:917
+-#, c-format
+-msgid "option type (%d) not implemented in popt\n"
+-msgstr ""
+-
+-#: popt.c:1132
+-msgid "missing argument"
+-msgstr ""
+-
+-#: popt.c:1134
+-msgid "unknown option"
+-msgstr ""
+-
+-#: popt.c:1136
+-msgid "mutually exclusive logical operations requested"
+-msgstr ""
+-
+-#: popt.c:1138
+-msgid "opt->arg should not be NULL"
+-msgstr ""
+-
+-#: popt.c:1140
+-msgid "aliases nested too deeply"
+-msgstr ""
+-
+-#: popt.c:1142
+-msgid "error in parameter quoting"
+-msgstr ""
+-
+-#: popt.c:1144
+-msgid "invalid numeric value"
+-msgstr ""
+-
+-#: popt.c:1146
+-msgid "number too large or too small"
+-msgstr ""
+-
+-#: popt.c:1148
+-msgid "memory allocation failed"
+-msgstr ""
+-
+-#: popt.c:1152
+-msgid "unknown error"
+-msgstr ""
+-
+-#: popthelp.c:53
+-msgid "Show this help message"
+-msgstr ""
+-
+-#: popthelp.c:54
+-msgid "Display brief usage message"
+-msgstr ""
+-
+-#: popthelp.c:57
+-msgid "Display option defaults in message"
+-msgstr ""
+-
+-#: popthelp.c:99
+-msgid "NONE"
+-msgstr ""
+-
+-#: popthelp.c:100
+-msgid "VAL"
+-msgstr ""
+-
+-#: popthelp.c:101
+-msgid "INT"
+-msgstr ""
+-
+-#: popthelp.c:102
+-msgid "LONG"
+-msgstr ""
+-
+-#: popthelp.c:103
+-msgid "STRING"
+-msgstr ""
+-
+-#: popthelp.c:104
+-msgid "FLOAT"
+-msgstr ""
+-
+-#: popthelp.c:105
+-msgid "DOUBLE"
+-msgstr ""
+-
+-#: popthelp.c:106
+-msgid "ARG"
+-msgstr ""
+-
+-#: popthelp.c:459
+-msgid "Usage:"
+-msgstr ""
+-
+-#: popthelp.c:481
+-msgid "[OPTION...]"
+-msgstr ""
+diff -uNr popt-1.6.4.orig/po/it.po popt-1.6.4/po/it.po
+--- popt-1.6.4.orig/po/it.po Fri Feb 15 00:58:34 2002
++++ popt-1.6.4/po/it.po Thu Jan 1 01:00:00 1970
+@@ -1,116 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: popt 1.6.3\n"
+-"POT-Creation-Date: 2002-01-19 09:14-0500\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"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
+-
+-#: popt.c:29
+-msgid "unknown errno"
+-msgstr ""
+-
+-#: popt.c:917
+-#, c-format
+-msgid "option type (%d) not implemented in popt\n"
+-msgstr ""
+-
+-#: popt.c:1132
+-msgid "missing argument"
+-msgstr ""
+-
+-#: popt.c:1134
+-msgid "unknown option"
+-msgstr ""
+-
+-#: popt.c:1136
+-msgid "mutually exclusive logical operations requested"
+-msgstr ""
+-
+-#: popt.c:1138
+-msgid "opt->arg should not be NULL"
+-msgstr ""
+-
+-#: popt.c:1140
+-msgid "aliases nested too deeply"
+-msgstr ""
+-
+-#: popt.c:1142
+-msgid "error in parameter quoting"
+-msgstr ""
+-
+-#: popt.c:1144
+-msgid "invalid numeric value"
+-msgstr ""
+-
+-#: popt.c:1146
+-msgid "number too large or too small"
+-msgstr ""
+-
+-#: popt.c:1148
+-msgid "memory allocation failed"
+-msgstr ""
+-
+-#: popt.c:1152
+-msgid "unknown error"
+-msgstr ""
+-
+-#: popthelp.c:53
+-msgid "Show this help message"
+-msgstr ""
+-
+-#: popthelp.c:54
+-msgid "Display brief usage message"
+-msgstr ""
+-
+-#: popthelp.c:57
+-msgid "Display option defaults in message"
+-msgstr ""
+-
+-#: popthelp.c:99
+-msgid "NONE"
+-msgstr ""
+-
+-#: popthelp.c:100
+-msgid "VAL"
+-msgstr ""
+-
+-#: popthelp.c:101
+-msgid "INT"
+-msgstr ""
+-
+-#: popthelp.c:102
+-msgid "LONG"
+-msgstr ""
+-
+-#: popthelp.c:103
+-msgid "STRING"
+-msgstr ""
+-
+-#: popthelp.c:104
+-msgid "FLOAT"
+-msgstr ""
+-
+-#: popthelp.c:105
+-msgid "DOUBLE"
+-msgstr ""
+-
+-#: popthelp.c:106
+-msgid "ARG"
+-msgstr ""
+-
+-#: popthelp.c:459
+-msgid "Usage:"
+-msgstr ""
+-
+-#: popthelp.c:481
+-msgid "[OPTION...]"
+-msgstr ""
+diff -uNr popt-1.6.4.orig/po/ja.po popt-1.6.4/po/ja.po
+--- popt-1.6.4.orig/po/ja.po Fri Feb 15 00:58:34 2002
++++ popt-1.6.4/po/ja.po Thu Jan 1 01:00:00 1970
+@@ -1,116 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: popt 1.6.3\n"
+-"POT-Creation-Date: 2002-01-19 09:14-0500\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"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
+-
+-#: popt.c:29
+-msgid "unknown errno"
+-msgstr ""
+-
+-#: popt.c:917
+-#, c-format
+-msgid "option type (%d) not implemented in popt\n"
+-msgstr ""
+-
+-#: popt.c:1132
+-msgid "missing argument"
+-msgstr ""
+-
+-#: popt.c:1134
+-msgid "unknown option"
+-msgstr ""
+-
+-#: popt.c:1136
+-msgid "mutually exclusive logical operations requested"
+-msgstr ""
+-
+-#: popt.c:1138
+-msgid "opt->arg should not be NULL"
+-msgstr ""
+-
+-#: popt.c:1140
+-msgid "aliases nested too deeply"
+-msgstr ""
+-
+-#: popt.c:1142
+-msgid "error in parameter quoting"
+-msgstr ""
+-
+-#: popt.c:1144
+-msgid "invalid numeric value"
+-msgstr ""
+-
+-#: popt.c:1146
+-msgid "number too large or too small"
+-msgstr ""
+-
+-#: popt.c:1148
+-msgid "memory allocation failed"
+-msgstr ""
+-
+-#: popt.c:1152
+-msgid "unknown error"
+-msgstr ""
+-
+-#: popthelp.c:53
+-msgid "Show this help message"
+-msgstr ""
+-
+-#: popthelp.c:54
+-msgid "Display brief usage message"
+-msgstr ""
+-
+-#: popthelp.c:57
+-msgid "Display option defaults in message"
+-msgstr ""
+-
+-#: popthelp.c:99
+-msgid "NONE"
+-msgstr ""
+-
+-#: popthelp.c:100
+-msgid "VAL"
+-msgstr ""
+-
+-#: popthelp.c:101
+-msgid "INT"
+-msgstr ""
+-
+-#: popthelp.c:102
+-msgid "LONG"
+-msgstr ""
+-
+-#: popthelp.c:103
+-msgid "STRING"
+-msgstr ""
+-
+-#: popthelp.c:104
+-msgid "FLOAT"
+-msgstr ""
+-
+-#: popthelp.c:105
+-msgid "DOUBLE"
+-msgstr ""
+-
+-#: popthelp.c:106
+-msgid "ARG"
+-msgstr ""
+-
+-#: popthelp.c:459
+-msgid "Usage:"
+-msgstr ""
+-
+-#: popthelp.c:481
+-msgid "[OPTION...]"
+-msgstr ""
+diff -uNr popt-1.6.4.orig/po/pl.po popt-1.6.4/po/pl.po
+--- popt-1.6.4.orig/po/pl.po Fri Feb 15 00:58:35 2002
++++ popt-1.6.4/po/pl.po Thu Jan 1 01:00:00 1970
+@@ -1,116 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: popt 1.6.3\n"
+-"POT-Creation-Date: 2002-01-19 09:14-0500\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"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
+-
+-#: popt.c:29
+-msgid "unknown errno"
+-msgstr ""
+-
+-#: popt.c:917
+-#, c-format
+-msgid "option type (%d) not implemented in popt\n"
+-msgstr ""
+-
+-#: popt.c:1132
+-msgid "missing argument"
+-msgstr ""
+-
+-#: popt.c:1134
+-msgid "unknown option"
+-msgstr ""
+-
+-#: popt.c:1136
+-msgid "mutually exclusive logical operations requested"
+-msgstr ""
+-
+-#: popt.c:1138
+-msgid "opt->arg should not be NULL"
+-msgstr ""
+-
+-#: popt.c:1140
+-msgid "aliases nested too deeply"
+-msgstr ""
+-
+-#: popt.c:1142
+-msgid "error in parameter quoting"
+-msgstr ""
+-
+-#: popt.c:1144
+-msgid "invalid numeric value"
+-msgstr ""
+-
+-#: popt.c:1146
+-msgid "number too large or too small"
+-msgstr ""
+-
+-#: popt.c:1148
+-msgid "memory allocation failed"
+-msgstr ""
+-
+-#: popt.c:1152
+-msgid "unknown error"
+-msgstr ""
+-
+-#: popthelp.c:53
+-msgid "Show this help message"
+-msgstr ""
+-
+-#: popthelp.c:54
+-msgid "Display brief usage message"
+-msgstr ""
+-
+-#: popthelp.c:57
+-msgid "Display option defaults in message"
+-msgstr ""
+-
+-#: popthelp.c:99
+-msgid "NONE"
+-msgstr ""
+-
+-#: popthelp.c:100
+-msgid "VAL"
+-msgstr ""
+-
+-#: popthelp.c:101
+-msgid "INT"
+-msgstr ""
+-
+-#: popthelp.c:102
+-msgid "LONG"
+-msgstr ""
+-
+-#: popthelp.c:103
+-msgid "STRING"
+-msgstr ""
+-
+-#: popthelp.c:104
+-msgid "FLOAT"
+-msgstr ""
+-
+-#: popthelp.c:105
+-msgid "DOUBLE"
+-msgstr ""
+-
+-#: popthelp.c:106
+-msgid "ARG"
+-msgstr ""
+-
+-#: popthelp.c:459
+-msgid "Usage:"
+-msgstr ""
+-
+-#: popthelp.c:481
+-msgid "[OPTION...]"
+-msgstr ""
+diff -uNr popt-1.6.4.orig/po/pt.po popt-1.6.4/po/pt.po
+--- popt-1.6.4.orig/po/pt.po Fri Feb 15 00:58:35 2002
++++ popt-1.6.4/po/pt.po Tue Sep 2 01:42:36 2003
+@@ -6,8 +6,8 @@
+ "Last-Translator: Pedro Morais <morais@kde.org>\n"
+ "Language-Team: pt <morais@kde.org>\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=iso-latin1\n"
+-"Content-Transfer-Encoding: none\n"
++"Content-Type: text/plain; charset=iso-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
+
+ #: popt.c:29
+ msgid "unknown errno"
+diff -uNr popt-1.6.4.orig/po/pt_BR.po popt-1.6.4/po/pt_BR.po
+--- popt-1.6.4.orig/po/pt_BR.po Fri Feb 15 00:58:35 2002
++++ popt-1.6.4/po/pt_BR.po Thu Jan 1 01:00:00 1970
+@@ -1,116 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: popt 1.6.3\n"
+-"POT-Creation-Date: 2002-01-19 09:14-0500\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"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
+-
+-#: popt.c:29
+-msgid "unknown errno"
+-msgstr ""
+-
+-#: popt.c:917
+-#, c-format
+-msgid "option type (%d) not implemented in popt\n"
+-msgstr ""
+-
+-#: popt.c:1132
+-msgid "missing argument"
+-msgstr ""
+-
+-#: popt.c:1134
+-msgid "unknown option"
+-msgstr ""
+-
+-#: popt.c:1136
+-msgid "mutually exclusive logical operations requested"
+-msgstr ""
+-
+-#: popt.c:1138
+-msgid "opt->arg should not be NULL"
+-msgstr ""
+-
+-#: popt.c:1140
+-msgid "aliases nested too deeply"
+-msgstr ""
+-
+-#: popt.c:1142
+-msgid "error in parameter quoting"
+-msgstr ""
+-
+-#: popt.c:1144
+-msgid "invalid numeric value"
+-msgstr ""
+-
+-#: popt.c:1146
+-msgid "number too large or too small"
+-msgstr ""
+-
+-#: popt.c:1148
+-msgid "memory allocation failed"
+-msgstr ""
+-
+-#: popt.c:1152
+-msgid "unknown error"
+-msgstr ""
+-
+-#: popthelp.c:53
+-msgid "Show this help message"
+-msgstr ""
+-
+-#: popthelp.c:54
+-msgid "Display brief usage message"
+-msgstr ""
+-
+-#: popthelp.c:57
+-msgid "Display option defaults in message"
+-msgstr ""
+-
+-#: popthelp.c:99
+-msgid "NONE"
+-msgstr ""
+-
+-#: popthelp.c:100
+-msgid "VAL"
+-msgstr ""
+-
+-#: popthelp.c:101
+-msgid "INT"
+-msgstr ""
+-
+-#: popthelp.c:102
+-msgid "LONG"
+-msgstr ""
+-
+-#: popthelp.c:103
+-msgid "STRING"
+-msgstr ""
+-
+-#: popthelp.c:104
+-msgid "FLOAT"
+-msgstr ""
+-
+-#: popthelp.c:105
+-msgid "DOUBLE"
+-msgstr ""
+-
+-#: popthelp.c:106
+-msgid "ARG"
+-msgstr ""
+-
+-#: popthelp.c:459
+-msgid "Usage:"
+-msgstr ""
+-
+-#: popthelp.c:481
+-msgid "[OPTION...]"
+-msgstr ""
+diff -uNr popt-1.6.4.orig/po/sr.po popt-1.6.4/po/sr.po
+--- popt-1.6.4.orig/po/sr.po Fri Feb 15 00:58:35 2002
++++ popt-1.6.4/po/sr.po Thu Jan 1 01:00:00 1970
+@@ -1,116 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: popt 1.6.3\n"
+-"POT-Creation-Date: 2002-01-19 09:14-0500\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"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
+-
+-#: popt.c:29
+-msgid "unknown errno"
+-msgstr ""
+-
+-#: popt.c:917
+-#, c-format
+-msgid "option type (%d) not implemented in popt\n"
+-msgstr ""
+-
+-#: popt.c:1132
+-msgid "missing argument"
+-msgstr ""
+-
+-#: popt.c:1134
+-msgid "unknown option"
+-msgstr ""
+-
+-#: popt.c:1136
+-msgid "mutually exclusive logical operations requested"
+-msgstr ""
+-
+-#: popt.c:1138
+-msgid "opt->arg should not be NULL"
+-msgstr ""
+-
+-#: popt.c:1140
+-msgid "aliases nested too deeply"
+-msgstr ""
+-
+-#: popt.c:1142
+-msgid "error in parameter quoting"
+-msgstr ""
+-
+-#: popt.c:1144
+-msgid "invalid numeric value"
+-msgstr ""
+-
+-#: popt.c:1146
+-msgid "number too large or too small"
+-msgstr ""
+-
+-#: popt.c:1148
+-msgid "memory allocation failed"
+-msgstr ""
+-
+-#: popt.c:1152
+-msgid "unknown error"
+-msgstr ""
+-
+-#: popthelp.c:53
+-msgid "Show this help message"
+-msgstr ""
+-
+-#: popthelp.c:54
+-msgid "Display brief usage message"
+-msgstr ""
+-
+-#: popthelp.c:57
+-msgid "Display option defaults in message"
+-msgstr ""
+-
+-#: popthelp.c:99
+-msgid "NONE"
+-msgstr ""
+-
+-#: popthelp.c:100
+-msgid "VAL"
+-msgstr ""
+-
+-#: popthelp.c:101
+-msgid "INT"
+-msgstr ""
+-
+-#: popthelp.c:102
+-msgid "LONG"
+-msgstr ""
+-
+-#: popthelp.c:103
+-msgid "STRING"
+-msgstr ""
+-
+-#: popthelp.c:104
+-msgid "FLOAT"
+-msgstr ""
+-
+-#: popthelp.c:105
+-msgid "DOUBLE"
+-msgstr ""
+-
+-#: popthelp.c:106
+-msgid "ARG"
+-msgstr ""
+-
+-#: popthelp.c:459
+-msgid "Usage:"
+-msgstr ""
+-
+-#: popthelp.c:481
+-msgid "[OPTION...]"
+-msgstr ""
+diff -uNr popt-1.6.4.orig/po/zh.po popt-1.6.4/po/zh.po
+--- popt-1.6.4.orig/po/zh.po Fri Feb 15 00:58:35 2002
++++ popt-1.6.4/po/zh.po Thu Jan 1 01:00:00 1970
+@@ -1,116 +0,0 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#
+-#, fuzzy
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: popt 1.6.3\n"
+-"POT-Creation-Date: 2002-01-19 09:14-0500\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"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
+-"Content-Transfer-Encoding: ENCODING\n"
+-
+-#: popt.c:29
+-msgid "unknown errno"
+-msgstr ""
+-
+-#: popt.c:917
+-#, c-format
+-msgid "option type (%d) not implemented in popt\n"
+-msgstr ""
+-
+-#: popt.c:1132
+-msgid "missing argument"
+-msgstr ""
+-
+-#: popt.c:1134
+-msgid "unknown option"
+-msgstr ""
+-
+-#: popt.c:1136
+-msgid "mutually exclusive logical operations requested"
+-msgstr ""
+-
+-#: popt.c:1138
+-msgid "opt->arg should not be NULL"
+-msgstr ""
+-
+-#: popt.c:1140
+-msgid "aliases nested too deeply"
+-msgstr ""
+-
+-#: popt.c:1142
+-msgid "error in parameter quoting"
+-msgstr ""
+-
+-#: popt.c:1144
+-msgid "invalid numeric value"
+-msgstr ""
+-
+-#: popt.c:1146
+-msgid "number too large or too small"
+-msgstr ""
+-
+-#: popt.c:1148
+-msgid "memory allocation failed"
+-msgstr ""
+-
+-#: popt.c:1152
+-msgid "unknown error"
+-msgstr ""
+-
+-#: popthelp.c:53
+-msgid "Show this help message"
+-msgstr ""
+-
+-#: popthelp.c:54
+-msgid "Display brief usage message"
+-msgstr ""
+-
+-#: popthelp.c:57
+-msgid "Display option defaults in message"
+-msgstr ""
+-
+-#: popthelp.c:99
+-msgid "NONE"
+-msgstr ""
+-
+-#: popthelp.c:100
+-msgid "VAL"
+-msgstr ""
+-
+-#: popthelp.c:101
+-msgid "INT"
+-msgstr ""
+-
+-#: popthelp.c:102
+-msgid "LONG"
+-msgstr ""
+-
+-#: popthelp.c:103
+-msgid "STRING"
+-msgstr ""
+-
+-#: popthelp.c:104
+-msgid "FLOAT"
+-msgstr ""
+-
+-#: popthelp.c:105
+-msgid "DOUBLE"
+-msgstr ""
+-
+-#: popthelp.c:106
+-msgid "ARG"
+-msgstr ""
+-
+-#: popthelp.c:459
+-msgid "Usage:"
+-msgstr ""
+-
+-#: popthelp.c:481
+-msgid "[OPTION...]"
+-msgstr ""
+--- popt-1.6.4.orig/po/Makefile.in Thu Feb 14 00:03:52 2002
++++ popt-1.6.4/po/Makefile.in Tue Sep 2 01:52:37 2003
+@@ -44,14 +44,14 @@
+ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+
+ SOURCES = cat-id-tbl.c
+-POFILES = cs.po da.po de.po es.po eu_ES.po fi.po fr.po gl.po hu.po id.po is.po it.po ja.po ko.po no.po pl.po pt.po pt_BR.po ro.po ru.po sk.po sl.po sr.po sv.po tr.po uk.po wa.po zh.po zh_CN.GB2312.po
+-GMOFILES = cs.gmo da.gmo de.gmo es.gmo eu_ES.gmo fi.gmo fr.gmo gl.gmo hu.gmo id.gmo is.gmo it.gmo ja.gmo ko.gmo no.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo sk.gmo sl.gmo sr.gmo sv.gmo tr.gmo uk.gmo wa.gmo zh.gmo zh_CN.GB2312.gmo
++POFILES = cs.po da.po es.po gl.po hu.po is.po ko.po no.po pt.po ro.po ru.po sk.po sl.po sv.po tr.po uk.po wa.po zh_CN.po
++GMOFILES = cs.gmo da.gmo es.gmo gl.gmo hu.gmo is.gmo ko.gmo no.gmo pt.gmo ro.gmo ru.gmo sk.gmo sl.gmo sv.gmo tr.gmo uk.gmo wa.gmo zh_CN.gmo
+ DISTFILES = Makefile.in.in POTFILES.in $(PACKAGE).pot \
+ stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
+
+ POTFILES = \
+
+-CATALOGS = cs.gmo da.gmo de.gmo es.gmo eu_ES.gmo fi.gmo fr.gmo gl.gmo hu.gmo id.gmo is.gmo it.gmo ja.gmo ko.gmo no.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo sk.gmo sl.gmo sr.gmo sv.gmo tr.gmo uk.gmo wa.gmo zh.gmo zh_CN.GB2312.gmo
++CATALOGS = cs.gmo da.gmo es.gmo gl.gmo hu.gmo is.gmo ko.gmo no.gmo pt.gmo ro.gmo ru.gmo sk.gmo sl.gmo sv.gmo tr.gmo uk.gmo wa.gmo zh_CN.gmo
+ CATOBJEXT = .gmo
+ INSTOBJEXT = .mo
+