- missing key(s) on keyring when verifying a signature is now an error.

- remove dependency whiteout.
- splint fiddles.

CVS patchset: 5255
CVS date: 2002/01/18 22:51:30

37 files changed, 508 insertions, 454 deletions

diff --git a/popt/.lclintrc b/popt/.lclintrc
index bf23f75df..6a85d8279 100644
--- a/popt/.lclintrc
+++ b/popt/.lclintrc
@@ -1,36 +1,65 @@
--I. -I./build -I./lib -I./rpmio -I./popt -DHAVE_CONFIG_H -D_GNU_SOURCE
+-I. -DHAVE_CONFIG_H -D_GNU_SOURCE
 
 +partial
++forcehints
 
 -warnunixlib
 -warnposix
 
 +unixlib
 
-# XXX ignore doxygen markings
--unrecogcomments
-
-# don't-bother-me-yet parameters
-#-branchstate		# painful
--mustfree		# alloca is painful
-
-# not-yet normal parameters
--boolops		# w->n
--predboolint		# w->n
--type			#
-
-# -weak paramaters
-#+boolint
-#-boolops
-#+ignorequals
-#+ignoresigns
-#-mustfree
-#+longintegral
-#+matchanyintegral
-#-nullpass
-#-observertrans
-#-predboolint
-#-predboolothers
-#-retvalint
-#-retvalother
-#-shiftsigned
+-unrecogcomments	# XXX ignore doxygen markings
+
++strict			# lclint level
+
+# --- +partial artifacts
+-declundef
+-exportheadervar
+-exportlocal
+
+-enummemuse
+-fcnuse
+-typeuse
+-varuse
+
+# --- not-yet at strict level
+-bitwisesigned		# pita
+-elseifcomplete		# 95 occurences
+-exportconst		# 839 occurences
+-exportfcn
+-exporttype
+-exportvar
+-fielduse		# 1 occurence <bits/sigset.h>
+-forblock		# tedious
+-ifblock		# tedious
+-incondefs		# <bits/{ipc,pthreadtypes}.h> heartburn
+-matchfields		# <bits/ipc.h> heartburn
+-namechecks		# tedious ANSI compliance checks
+-numenummembers 1024	# RPMTAG has 138 members
+-numstructfields 256	# Java jni.h has 229 fields
+-ptrarith		# tedious
+
+-compdestroy
+-mustdefine
+-shiftimplementation
+#-shiftnegative
+
+-strictops
+-strictusereleased
+-stringliterallen 4096	# redhat*PubKey's are big
+-whileblock		# tedious
+
+# --- not-yet at checks level
+-ansi-reserved
++enumint
+-mustfree
+-predboolptr
+-usedef
+
+# --- not-yet at standard level
+-boolops
+-predboolint
++boolint
++charint
++ignorequals
++matchanyintegral
diff --git a/popt/findme.c b/popt/findme.c
index f8d51bd36..e98e0611b 100644
--- a/popt/findme.c
+++ b/popt/findme.c
@@ -28,6 +28,7 @@ const char * findProgramPath(const char * argv0) {
     strcpy(pathbuf, path);
 
     chptr = NULL;
+    /*@-branchstate@*/
     do {
 	if ((chptr = strchr(start, ':')))
 	    *chptr = '\0';
@@ -41,6 +42,7 @@ const char * findProgramPath(const char * argv0) {
 	else
 	    start = NULL;
     } while (start && *start);
+    /*@=branchstate@*/
 
     free(buf);
 
diff --git a/popt/po/cs.po b/popt/po/cs.po
index 010b1f459..994ee16ce 100644
--- a/popt/po/cs.po
+++ b/popt/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "neznámé èíslo chyby"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) není v popt implementována\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "chybí argument"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "neznámá volba"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "po¾adovány vzájemnì výluèné logické operace"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesmí být NULL"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "aliasy vnoøené pøíli¹ hluboko"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "chyba v quotování parametrù"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "chybná numerická hodnota"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "èíslo je pøíli¹ velké nebo pøíli¹ malé"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "selhala alokace pamìti"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "neznámá chyba"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Pou¾ití:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/popt/po/da.po b/popt/po/da.po
index 8c91136a7..a3dd547a1 100644
--- a/popt/po/da.po
+++ b/popt/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "de ønskede handlinger udelukker hinanden"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk værdi"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "ukendt fejl"
 
@@ -104,10 +104,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/popt/po/de.po b/popt/po/de.po
index aeb7c99ce..6cfef98ae 100644
--- a/popt/po/de.po
+++ b/popt/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/es.po b/popt/po/es.po
index 3279bc017..a45041550 100644
--- a/popt/po/es.po
+++ b/popt/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opción (%d) no implementada en popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "opción desconocida"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operación lógica mutuamente exclusiva"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "error en cita de parámetros"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "valor numérico inválido"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "número muy largo o muy pequeño"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "error desconocido"
 
@@ -108,10 +108,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/popt/po/eu_ES.po b/popt/po/eu_ES.po
index aeb7c99ce..6cfef98ae 100644
--- a/popt/po/eu_ES.po
+++ b/popt/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/fi.po b/popt/po/fi.po
index aeb7c99ce..6cfef98ae 100644
--- a/popt/po/fi.po
+++ b/popt/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/fr.po b/popt/po/fr.po
index aeb7c99ce..6cfef98ae 100644
--- a/popt/po/fr.po
+++ b/popt/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/gl.po b/popt/po/gl.po
index 3991f4f5d..e1ca10e76 100644
--- a/popt/po/gl.po
+++ b/popt/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno descoñecido"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opción (%d) non implementada en popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "opción descoñecida"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "solicitáronse operacións lóxicas mutuamente excluíntes"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "aliases aniñados a un nivel demasiado profundo"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "erro nas comiñas do parámetro"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "valor numérico non válido"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "número demasiado grande ou pequeno"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "erro descoñecido"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/popt/po/hu.po b/popt/po/hu.po
index fce9e239b..87c9c0821 100644
--- a/popt/po/hu.po
+++ b/popt/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: László Németh <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/id.po b/popt/po/id.po
index aeb7c99ce..6cfef98ae 100644
--- a/popt/po/id.po
+++ b/popt/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/is.po b/popt/po/is.po
index f809095b4..d63865815 100644
--- a/popt/po/is.po
+++ b/popt/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "óþekkt villunúmer"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofagerðin (%d) er ekki studd í popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "vantar viðfang"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "óþekktur rofi"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "beðið um rofa sem slökkva hvor á öðrum"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ætti ekki að vera NULL"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "alíasar of flóknir"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "villa í viðföngum (gæsalappir og svo frv.)"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "ógilt tölulegt gildi"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "talan of stór eða smá"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "ekki tókst að taka frá minni"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "óþekkt villa"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/popt/po/it.po b/popt/po/it.po
index aeb7c99ce..6cfef98ae 100644
--- a/popt/po/it.po
+++ b/popt/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/ja.po b/popt/po/ja.po
index aeb7c99ce..6cfef98ae 100644
--- a/popt/po/ja.po
+++ b/popt/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/ko.po b/popt/po/ko.po
index d7e753b76..11d34a266 100644
--- a/popt/po/ko.po
+++ b/popt/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ùÄÚµå(errno) ÀÔ´Ï´Ù"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "¿É¼Ç À¯Çü (%d)Àº popt¿¡¼­ »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "¾Ë ¼ö ¾ø´Â ¿É¼ÇÀÔ´Ï´Ù"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "¾çÂÊ¿¡ ¹èŸÀû ³í¸® ¿¬»êÀÌ ÁöÁ¤µÇ¾ú½À´Ï´Ù"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "¿É¼Ç->Àμö°¡ NULLÀÌ µÇ¾î¼­´Â ¾ÈµË´Ï´Ù"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "º°Äª(alias)ÀÌ º¹ÀâÇÏ°Ô ¼³Á¤µÇ¾ú½À´Ï´Ù"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "¸Å°³º¯¼ö¿¡ ¿À·ù°¡ ÀÖ½À´Ï´Ù"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "À߸øµÈ ¼öÄ¡ °ªÀÔ´Ï´Ù"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "¼ýÀÚ°¡ ³Ê¹« Å©°Å³ª ³Ê¹« Àû½À´Ï´Ù"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "¸Þ¸ð¸® ÇÒ´ç¿¡ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ùÀÔ´Ï´Ù"
 
@@ -102,10 +102,10 @@ msgstr "¼Ò¼ö(DOUBLE)"
 msgid "ARG"
 msgstr "Àμö(ARG)"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "»ç¿ë¹ý:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[¿É¼Ç...]"
diff --git a/popt/po/no.po b/popt/po/no.po
index 8c3f3f3be..39f382400 100644
--- a/popt/po/no.po
+++ b/popt/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg må ikke være NULL"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype løkker"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "ukjent feil"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/popt/po/pl.po b/popt/po/pl.po
index aeb7c99ce..6cfef98ae 100644
--- a/popt/po/pl.po
+++ b/popt/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index 9dd410475..c66570dc9 100644
--- a/popt/po/popt.pot
+++ b/popt/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/pt.po b/popt/po/pt.po
index 992d84229..b6040c248 100644
--- a/popt/po/pt.po
+++ b/popt/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-01-21 19:31+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opção (%d) não implementado no popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "opção desconhecida"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas operações lógicas mutuamente exclusivas"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de parâmetros"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "valor númerico inválido"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "número demasiado grando ou pequeno"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "erro desconhecido"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Utilização:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[OPÇÃO...]"
diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po
index aeb7c99ce..6cfef98ae 100644
--- a/popt/po/pt_BR.po
+++ b/popt/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/ro.po b/popt/po/ro.po
index 34f2f1713..7289ba905 100644
--- a/popt/po/ro.po
+++ b/popt/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -13,49 +13,49 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1132
+#: popt.c:1142
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
@@ -104,10 +104,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/popt/po/ru.po b/popt/po/ru.po
index 6d109167f..0655d8629 100644
--- a/popt/po/ru.po
+++ b/popt/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÎÏÍÅÒ ÏÛÉÂËÉ"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "ÏÂÒÁÂÏÔËÁ ÐÁÒÁÍÅÔÒÁ (%d) × popt ÎÅ ÐÒÅÄÕÓÍÏÔÒÅÎÁ\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "ÚÁÐÒÏÛÅÎÙ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÅ ÌÏÇÉÞÅÓËÉÅ ÏÐÅÒÁÃÉÉ"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ÎÅ ÍÏÖÅÔ ÂÙÔØ NULL"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "ÐÒÅ×ÙÛÅÎ ÕÒÏ×ÅÎØ ÄÏÐÕÓÔÉÍÏÊ ÒÅËÕÒÓÉÉ ÐÏÄÓÔÁÎÏ×ÏË"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "ÏÛÉÂËa ÐÏÍÅÝÅÎÉÑ ÐÁÒÁÍÅÔÒÏ× × ËÁ×ÙÞËÉ"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ ÚÁ ÐÒÅÄÅÌÁÍÉ ÐÒÅÄÕÓÍÏÔÒÅÎÎÏÇÏ"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "ÏÛÉÂËÁ ×ÙÄÅÌÅÎÉÑ ÐÁÍÑÔÉ"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[ðáòáíåôò...]"
diff --git a/popt/po/sk.po b/popt/po/sk.po
index 118cc6ad4..ea8c4ca29 100644
--- a/popt/po/sk.po
+++ b/popt/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -17,48 +17,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/sl.po b/popt/po/sl.po
index e0daf0b94..fe5f1e53e 100644
--- a/popt/po/sl.po
+++ b/popt/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/sr.po b/popt/po/sr.po
index aeb7c99ce..6cfef98ae 100644
--- a/popt/po/sr.po
+++ b/popt/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/sv.po b/popt/po/sv.po
index d5f3bfd13..e0b6a9fcb 100644
--- a/popt/po/sv.po
+++ b/popt/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "okänt felnummer"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) är inte implementerad i popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "okänd flagga"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "ömsesidigt uteslutande logiska operationer begärdes"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg får inte vara NULL"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "alias är nästlade för djupt"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt värde"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "talet för stort eller för litet"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "okänt fel"
 
@@ -102,10 +102,10 @@ msgstr "DUBBEL"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Användning:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index c434a0544..3eb3d37e0 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "seçenek türü (%d) popt için geçersiz\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "argüman eksik"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "bilinmeyen seçenek"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini dýþlayan mantýksal iþlemler istendi"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "adlarda çok fazla içiçelikler"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "parametrelerde týrnak iþaretleme hatalý "
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "sayýsal deðer geçersiz"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "sayý ya çok büyük ya da çok küçük"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Kullanýmý:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[SEÇENEK...]"
diff --git a/popt/po/uk.po b/popt/po/uk.po
index 7c3dfc4c2..4ddfa1d99 100644
--- a/popt/po/uk.po
+++ b/popt/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,48 +17,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/wa.po b/popt/po/wa.po
index 9739f16d4..b1b0d10cb 100644
--- a/popt/po/wa.po
+++ b/popt/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -21,48 +21,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -111,10 +111,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/zh.po b/popt/po/zh.po
index aeb7c99ce..6cfef98ae 100644
--- a/popt/po/zh.po
+++ b/popt/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-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"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po
index 1bd96faea..8a54e4c65 100644
--- a/popt/po/zh_CN.GB2312.po
+++ b/popt/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/popt.c b/popt/popt.c
index cd01a77d5..962f9732f 100644
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -49,6 +49,9 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
     con->execPath = _free(con->execPath);
     con->execPath = xstrdup(path);
     con->execAbsolute = allowAbsolute;
+    /*@-nullstate@*/ /* LCL: con->execPath can be NULL? */
+    return;
+    /*@=nullstate@*/
 }
 
 static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
@@ -591,6 +594,9 @@ static void poptStripArg(/*@special@*/ poptContext con, int which)
     if (con->arg_strip != NULL)		/* XXX can't happen */
     PBM_SET(which, con->arg_strip);
     /*@=sizeoftype@*/
+    /*@-compdef@*/ /* LCL: con->arg_strip udefined? */
+    return;
+    /*@=compdef@*/
 }
 
 static int poptSaveLong(const struct poptOption * opt, long aLong)
@@ -763,6 +769,7 @@ int poptGetNextOpt(poptContext con)
 	}
 
 	/* Process next short option */
+	/*@-branchstate@*/		/* FIX: W2DO? */
 	if (con->os->nextCharArg) {
 	    origOptString = con->os->nextCharArg;
 
@@ -786,11 +793,10 @@ int poptGetNextOpt(poptContext con)
 	    shorty = 1;
 
 	    origOptString++;
-	    /*@-branchstate@*/		/* FIX: W2DO? */
 	    if (*origOptString != '\0')
 		con->os->nextCharArg = origOptString;
-	    /*@=branchstate@*/
 	}
+	/*@=branchstate@*/
 
 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
@@ -962,10 +968,12 @@ int poptGetNextOpt(poptContext con)
 const char * poptGetOptArg(poptContext con)
 {
     const char * ret = NULL;
+    /*@-branchstate@*/
     if (con) {
 	ret = con->os->nextArg;
 	con->os->nextArg = NULL;
     }
+    /*@=branchstate@*/
     return ret;
 }
 
@@ -1060,6 +1068,7 @@ int poptAddAlias(poptContext con, struct poptAlias alias,
     return poptAddItem(con, item, 0);
 }
 
+/*@-mustmod@*/ /* LCL: con not modified? */
 int poptAddItem(poptContext con, poptItem newItem, int flags)
 {
     poptItem * items, item;
@@ -1102,6 +1111,7 @@ int poptAddItem(poptContext con, poptItem newItem, int flags)
 
     return 0;
 }
+/*@=mustmod@*/
 
 const char * poptBadOption(poptContext con, int flags)
 {
diff --git a/popt/poptconfig.c b/popt/poptconfig.c
index 7f80ff0a1..58ccf0153 100644
--- a/popt/poptconfig.c
+++ b/popt/poptconfig.c
@@ -81,10 +81,12 @@ static void configLine(poptContext con, char * line)
     }
     /*@=modobserver@*/
 	
+    /*@-nullstate@*/ /* FIX: item->argv[] may be NULL */
     if (!strcmp(entryType, "alias"))
 	(void) poptAddItem(con, item, 0);
     else if (!strcmp(entryType, "exec"))
 	(void) poptAddItem(con, item, 1);
+    /*@=nullstate@*/
 }
 /*@=compmempass@*/
 
diff --git a/popt/popthelp.c b/popt/popthelp.c
index 5befe631e..17adc6f2b 100644
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -330,7 +330,9 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
     if (helpLength) fprintf(fp, "%s\n", help);
 
 out:
+    /*@-dependenttrans@*/
     defs = _free(defs);
+    /*@=dependenttrans@*/
     left = _free(left);
 }
 
diff --git a/popt/poptint.h b/popt/poptint.h
index 18a6c4d89..30172fea8 100644
--- a/popt/poptint.h
+++ b/popt/poptint.h
@@ -26,7 +26,7 @@ _free(/*@only@*/ /*@null@*/ const void * p)
 typedef	unsigned int __pbm_bits;
 #define	__PBM_NBITS		(8 * sizeof (__pbm_bits))
 #define	__PBM_IX(d)		((d) / __PBM_NBITS)
-#define __PBM_MASK(d)		((__pbm_bits) 1 << ((d) % __PBM_NBITS))
+#define __PBM_MASK(d)		((__pbm_bits) 1 << (((unsigned)(d)) % __PBM_NBITS))
 typedef struct {
     __pbm_bits bits[1];
 } pbm_set;
diff --git a/popt/system.h b/popt/system.h
index 2ff758815..338be45b3 100644
--- a/popt/system.h
+++ b/popt/system.h
@@ -25,6 +25,14 @@
 #include <libc.h>
 #endif
 
+#if defined(__LCLINT__)
+/*@-declundef -incondefs -redecl@*/ /* LCL: missing annotation */
+/*@only@*/ void * alloca (size_t __size)
+	/*@ensures MaxSet(result) == (__size - 1) @*/
+	/*@*/;
+/*@=declundef =incondefs =redecl@*/
+#endif
+
 /* AIX requires this to be the first thing in the file.  */ 
 #ifndef __GNUC__
 # if HAVE_ALLOCA_H
@@ -42,8 +50,10 @@ char *alloca ();
 #define alloca __builtin_alloca
 #endif
 
-#if !defined(__LCLINT__)
-/*@only@*/ char * xstrdup (const char *str);
+/*@-redecl -redef@*/
+/*@mayexit@*/ /*@only@*/ char * xstrdup (const char *str)
+	/*@*/;
+/*@=redecl =redef@*/
 
 #if HAVE_MCHECK_H && defined(__GNUC__)
 #define	vmefail()	(fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
@@ -51,7 +61,6 @@ char *alloca ();
 #else
 #define	xstrdup(_str)	strdup(_str)
 #endif  /* HAVE_MCHECK_H && defined(__GNUC__) */
-#endif /* !__LCLINT__ */
 
 
 #include "popt.h"