Explicit branchstate annotations.

CVS patchset: 5113
CVS date: 2001/10/15 17:53:34

33 files changed, 432 insertions, 427 deletions

diff --git a/popt/findme.h b/popt/findme.h
index bb54ec780..a016b867e 100644
--- a/popt/findme.h
+++ b/popt/findme.h
@@ -15,6 +15,6 @@
  * @return		(malloc'd) absolute path to executable (or NULL)
  */
 /*@null@*/ const char * findProgramPath(/*@null@*/ const char * argv0)
-	/*@modifies fileSystem @*/;
+	/*@*/;
 
 #endif
diff --git a/popt/po/cs.po b/popt/po/cs.po
index 220e90ea5..82d1ee83f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) není v popt implementována\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "chybí argument"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "neznámá volba"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "po¾adovány vzájemnì výluèné logické operace"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesmí být NULL"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "aliasy vnoøené pøíli¹ hluboko"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "chyba v quotování parametrù"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "chybná numerická hodnota"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "èíslo je pøíli¹ velké nebo pøíli¹ malé"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "selhala alokace pamìti"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "neznámá chyba"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Pou¾ití:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/popt/po/da.po b/popt/po/da.po
index d82df5314..0c0abd100 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "de ønskede handlinger udelukker hinanden"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk værdi"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "ukendt fejl"
 
@@ -104,10 +104,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/popt/po/de.po b/popt/po/de.po
index 934225fd9..83e97b14f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/es.po b/popt/po/es.po
index f152443ea..5de427b74 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opción (%d) no implementada en popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "opción desconocida"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operación lógica mutuamente exclusiva"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "error en cita de parámetros"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "valor numérico inválido"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "número muy largo o muy pequeño"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "error desconocido"
 
@@ -108,10 +108,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/popt/po/eu_ES.po b/popt/po/eu_ES.po
index 934225fd9..83e97b14f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/fi.po b/popt/po/fi.po
index 934225fd9..83e97b14f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/fr.po b/popt/po/fr.po
index 934225fd9..83e97b14f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/gl.po b/popt/po/gl.po
index 8ccc20d4c..ffe19942d 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opción (%d) non implementada en popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "opción descoñecida"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "solicitáronse operacións lóxicas mutuamente excluíntes"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "aliases aniñados a un nivel demasiado profundo"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "erro nas comiñas do parámetro"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "valor numérico non válido"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "número demasiado grande ou pequeno"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "erro descoñecido"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/popt/po/hu.po b/popt/po/hu.po
index b6fe1be5a..3d8a1853b 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/id.po b/popt/po/id.po
index 934225fd9..83e97b14f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/is.po b/popt/po/is.po
index d1af005b9..ca0b75c55 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofagerðin (%d) er ekki studd í popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "vantar viðfang"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "óþekktur rofi"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "beðið um rofa sem slökkva hvor á öðrum"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ætti ekki að vera NULL"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "alíasar of flóknir"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "villa í viðföngum (gæsalappir og svo frv.)"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "ógilt tölulegt gildi"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "talan of stór eða smá"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "ekki tókst að taka frá minni"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "óþekkt villa"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/popt/po/it.po b/popt/po/it.po
index 934225fd9..83e97b14f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/ja.po b/popt/po/ja.po
index 934225fd9..83e97b14f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/ko.po b/popt/po/ko.po
index 1bffb7d86..002a277b7 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "¿É¼Ç À¯Çü (%d)Àº popt¿¡¼­ »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "¾Ë ¼ö ¾ø´Â ¿É¼ÇÀÔ´Ï´Ù"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "¾çÂÊ¿¡ ¹èŸÀû ³í¸® ¿¬»êÀÌ ÁöÁ¤µÇ¾ú½À´Ï´Ù"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "¿É¼Ç->Àμö°¡ NULLÀÌ µÇ¾î¼­´Â ¾ÈµË´Ï´Ù"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "º°Äª(alias)ÀÌ º¹ÀâÇÏ°Ô ¼³Á¤µÇ¾ú½À´Ï´Ù"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "¸Å°³º¯¼ö¿¡ ¿À·ù°¡ ÀÖ½À´Ï´Ù"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "À߸øµÈ ¼öÄ¡ °ªÀÔ´Ï´Ù"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "¼ýÀÚ°¡ ³Ê¹« Å©°Å³ª ³Ê¹« Àû½À´Ï´Ù"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "¸Þ¸ð¸® ÇÒ´ç¿¡ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ùÀÔ´Ï´Ù"
 
@@ -102,10 +102,10 @@ msgstr "¼Ò¼ö(DOUBLE)"
 msgid "ARG"
 msgstr "Àμö(ARG)"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "»ç¿ë¹ý:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[¿É¼Ç...]"
diff --git a/popt/po/no.po b/popt/po/no.po
index 4f8e3ff84..5fb399411 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg må ikke være NULL"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype løkker"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "ukjent feil"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/popt/po/pl.po b/popt/po/pl.po
index 934225fd9..83e97b14f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index ca91a507b..4efb27c75 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/pt.po b/popt/po/pt.po
index 4d9d765bc..2c0675502 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, 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:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "opção desconhecida"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas operações lógicas mutuamente exclusivas"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de parâmetros"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "valor númerico inválido"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "número demasiado grando ou pequeno"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "erro desconhecido"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Utilização:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[OPÇÃO...]"
diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po
index 934225fd9..83e97b14f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/ro.po b/popt/po/ro.po
index 3d013b3b3..346d81842 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1121
+#: popt.c:1124
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
@@ -104,10 +104,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/popt/po/ru.po b/popt/po/ru.po
index aa0eb64aa..62a3af20f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "ÏÂÒÁÂÏÔËÁ ÐÁÒÁÍÅÔÒÁ (%d) × popt ÎÅ ÐÒÅÄÕÓÍÏÔÒÅÎÁ\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "ÚÁÐÒÏÛÅÎÙ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÅ ÌÏÇÉÞÅÓËÉÅ ÏÐÅÒÁÃÉÉ"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ÎÅ ÍÏÖÅÔ ÂÙÔØ NULL"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "ÐÒÅ×ÙÛÅÎ ÕÒÏ×ÅÎØ ÄÏÐÕÓÔÉÍÏÊ ÒÅËÕÒÓÉÉ ÐÏÄÓÔÁÎÏ×ÏË"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "ÏÛÉÂËa ÐÏÍÅÝÅÎÉÑ ÐÁÒÁÍÅÔÒÏ× × ËÁ×ÙÞËÉ"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ ÚÁ ÐÒÅÄÅÌÁÍÉ ÐÒÅÄÕÓÍÏÔÒÅÎÎÏÇÏ"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "ÏÛÉÂËÁ ×ÙÄÅÌÅÎÉÑ ÐÁÍÑÔÉ"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[ðáòáíåôò...]"
diff --git a/popt/po/sk.po b/popt/po/sk.po
index c9e9728e3..4e92400b7 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/sl.po b/popt/po/sl.po
index 4d49ebaa9..2f86bd75d 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/sr.po b/popt/po/sr.po
index 934225fd9..83e97b14f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/sv.po b/popt/po/sv.po
index b5e150e05..fded47e48 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) är inte implementerad i popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "okänd flagga"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "ömsesidigt uteslutande logiska operationer begärdes"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg får inte vara NULL"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "alias är nästlade för djupt"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt värde"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "talet för stort eller för litet"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "okänt fel"
 
@@ -102,10 +102,10 @@ msgstr "DUBBEL"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Användning:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index bdab0f64d..820861205 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, 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:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "argüman eksik"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "bilinmeyen seçenek"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini dýþlayan mantýksal iþlemler istendi"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "adlarda çok fazla içiçelikler"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "parametrelerde týrnak iþaretleme hatalý "
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "sayýsal deðer geçersiz"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "sayý ya çok büyük ya da çok küçük"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Kullanýmý:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[SEÇENEK...]"
diff --git a/popt/po/uk.po b/popt/po/uk.po
index 54fdc981b..944f7aaf0 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/wa.po b/popt/po/wa.po
index ac4f3611e..9eb4f8119 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -111,10 +111,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/zh.po b/popt/po/zh.po
index 934225fd9..83e97b14f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po
index f1b64c175..f1fb6fb9f 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-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\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:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/popt.c b/popt/popt.c
index 508c304ed..c7ec5bf99 100644
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -52,6 +52,7 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
 }
 
 static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
+	/*@globals internalState@*/
 	/*@modifies internalState@*/
 {
     if (opt != NULL)
@@ -74,6 +75,7 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 }
 
 static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
+	/*@globals internalState@*/
 	/*@modifies internalState@*/
 {
     if (opt != NULL)
@@ -99,6 +101,7 @@ static void invokeCallbacksOPTION(poptContext con,
 				  const struct poptOption * opt,
 				  const struct poptOption * myOpt,
 				  /*@null@*/ const void * myData, int shorty)
+	/*@globals internalState@*/
 	/*@modifies internalState@*/
 {
     const struct poptOption * cbopt = NULL;
@@ -341,7 +344,7 @@ static int handleAlias(/*@special@*/ poptContext con,
 }
 
 static int execCommand(poptContext con)
-    /*@modifies fileSystem @*/
+    /*@*/
 {
     poptItem item = con->doExec;
     const char ** argv;
@@ -1032,20 +1035,20 @@ poptContext poptFreeContext(poptContext con)
     return con;
 }
 
-int poptAddAlias(poptContext con, struct poptAlias newAlias,
+int poptAddAlias(poptContext con, struct poptAlias alias,
 		/*@unused@*/ int flags)
 {
     poptItem item = alloca(sizeof(*item));
     memset(item, 0, sizeof(*item));
-    item->option.longName = newAlias.longName;
-    item->option.shortName = newAlias.shortName;
+    item->option.longName = alias.longName;
+    item->option.shortName = alias.shortName;
     item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN;
     item->option.arg = 0;
     item->option.val = 0;
     item->option.descrip = NULL;
     item->option.argDescrip = NULL;
-    item->argc = newAlias.argc;
-    item->argv = newAlias.argv;
+    item->argc = alias.argc;
+    item->argv = alias.argv;
     return poptAddItem(con, item, 0);
 }
 
diff --git a/popt/popthelp.c b/popt/popthelp.c
index 7e223548d..853f5299a 100644
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -220,6 +220,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 	    *le++ = '[';
 
 	/* Choose type of output */
+	/*@-branchstate@*/
 	if (opt->argInfo & POPT_ARGFLAG_SHOW_DEFAULT) {
 	    defs = singleOptionDefaultValue(lineLength, opt, translation_domain);
 	    if (defs) {
@@ -238,6 +239,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 		defs = t;
 	    }
 	}
+	/*@=branchstate@*/
 
 	if (opt->argDescrip == NULL) {
 	    switch (opt->argInfo & POPT_ARG_MASK) {