- (popt): use sprintf rather than snprintf for portability.

don't bother reporting lchown failures, unimplemented on Red Hat 5.2 alpha.

31 files changed, 111 insertions, 110 deletions

diff --git a/po/cs.po b/po/cs.po
index c110b49..dddf88d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-0500\n"
 "PO-Revision-Date: 2001-02-08 14:56+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -90,10 +90,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "Pou¾ití:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index 16d8fa4..b349452 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -91,10 +91,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 7ef5b2f..858656d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 7ef5b2f..858656d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index e5f71fe..db307f7 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 7ef5b2f..858656d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 7ef5b2f..858656d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 6c690ec..f95e995 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -90,10 +90,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/po/hu.po b/po/hu.po
index 7e83227..7d97a67 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 7ef5b2f..858656d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index ecd96cb..3b36731 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-0500\n"
 "PO-Revision-Date: 2001-01-23 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -90,10 +90,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 7ef5b2f..858656d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 7ef5b2f..858656d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 7ef5b2f..858656d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 73d0fd9..559a3d4 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.2\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-0500\n"
 "PO-Revision-Date: 2001-01-23 22:52+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -90,10 +90,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index 7ef5b2f..858656d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index e5f71fe..db307f7 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 365d8a7..405dcf8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -90,10 +90,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "Utilização:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[OPÇÃO...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7ef5b2f..858656d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 960d2e5..77d2e1c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -91,10 +91,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 7607c5a..06c6b34 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-0500\n"
 "PO-Revision-Date: 2001-01-21 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -90,10 +90,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[ðáòáíåôò...]"
diff --git a/po/sk.po b/po/sk.po
index e775220..aceccb7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -94,10 +94,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 4467a84..3a74fad 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 7ef5b2f..858656d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 196e971..d924e11 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-0500\n"
 "PO-Revision-Date: 2001-01-16 00:40+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -90,10 +90,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "Användning:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index ca51e42..11e18fa 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -90,10 +90,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "Kullanýmý:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[SEÇENEK...]"
diff --git a/po/uk.po b/po/uk.po
index e10d920..58f98a0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -94,10 +94,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 41e1f2e..cee01c7 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -98,10 +98,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 7ef5b2f..858656d 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index c12ed7f..c6d055b 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-17 12:28-0500\n"
+"POT-Creation-Date: 2001-02-22 15:37-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"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popthelp.c b/popthelp.c
index 25cb791..a76b03c 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -78,31 +78,34 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
     const char * argDescrip = getArgDescrip(opt, translation_domain);
     int helpLength;
     char * left;
+    int nb = maxLeftCol + 1;
 
-    left = malloc(maxLeftCol + 1);
+    /* Make sure there's more than enough room in target buffer. */
+    if (opt->longName)	nb += strlen(opt->longName);
+    if (argDescrip)	nb += strlen(argDescrip);
+
+    left = malloc(nb);
     left[0] = left[maxLeftCol] = '\0';
 
     if (opt->longName && opt->shortName)
-	snprintf(left, maxLeftCol, "-%c, %s%s", opt->shortName,
+	sprintf(left, "-%c, %s%s", opt->shortName,
 		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
 		opt->longName);
     else if (opt->shortName) 
-	snprintf(left, maxLeftCol, "-%c", opt->shortName);
+	sprintf(left, "-%c", opt->shortName);
     else if (opt->longName)
-	snprintf(left, maxLeftCol, "%s%s",
+	sprintf(left, "%s%s",
 		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
 		opt->longName);
-    if (!*left) return ;
+    if (!*left) goto out;
     if (argDescrip) {
 	char * le = left + strlen(left);
-	int nl = maxLeftCol - (le - left);
-	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) {
-	    *le++ = '['; nl--;
-	}
+	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
+	    *le++ = '[';
 	if (opt->argDescrip == NULL) {
 	    switch (opt->argInfo & POPT_ARG_MASK) {
 	    case POPT_ARG_NONE:
-		snprintf(le, nl-1, "[true]");
+		sprintf(le, "[true]");
 		break;
 	    case POPT_ARG_VAL:
 	    {   long aLong = opt->val;
@@ -110,14 +113,14 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
 		if (opt->argInfo & POPT_ARGFLAG_NOT) aLong = ~aLong;
 		switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) {
 		case POPT_ARGFLAG_OR:
-		    snprintf(le, nl-1, "[|=0x%lx]", aLong);	break;
+		    sprintf(le, "[|=0x%lx]", aLong);	break;
 		case POPT_ARGFLAG_AND:
-		    snprintf(le, nl-1, "[&=0x%lx]", aLong);	break;
+		    sprintf(le, "[&=0x%lx]", aLong);	break;
 		case POPT_ARGFLAG_XOR:
-		    snprintf(le, nl-1, "[^=0x%lx]", aLong);	break;
+		    sprintf(le, "[^=0x%lx]", aLong);	break;
 		default:
 		    if (!(aLong == 0L || aLong == 1L || aLong == -1L))
-			snprintf(le, nl-1, "[=%ld]", aLong);
+			sprintf(le, "[=%ld]", aLong);
 		    break;
 		}
 	    }	break;
@@ -126,17 +129,15 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
 	    case POPT_ARG_STRING:
 	    case POPT_ARG_FLOAT:
 	    case POPT_ARG_DOUBLE:
-		snprintf(le, nl-1, "=%s", argDescrip);
+		sprintf(le, "=%s", argDescrip);
 		break;
 	    }
 	} else {
-	    snprintf(le, nl-1, "=%s", argDescrip);
+	    sprintf(le, "=%s", argDescrip);
 	}
-	nl -= strlen(le);
 	le += strlen(le);
-	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) {
-	    *le++ = ']'; nl--;
-	}
+	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
+	    *le++ = ']';
 	*le = '\0';
     }