diff options
author | jbj <jbj> | 2002-07-25 18:50:08 +0000 |
---|---|---|
committer | jbj <jbj> | 2002-07-25 18:50:08 +0000 |
commit | 61e31bda5dd0442099ff30f5bc9403c78ca0573c (patch) | |
tree | e508d7afa53b9e1956b3c44cf0cf3ee0d62e8941 | |
parent | 6e7cdba62111074241e31a99d65d1e75d160befc (diff) | |
download | libpopt-61e31bda5dd0442099ff30f5bc9403c78ca0573c.tar.gz |
- popt: fix --usage (#62234).
-rw-r--r-- | po/cs.po | 2 | ||||
-rw-r--r-- | po/da.po | 2 | ||||
-rw-r--r-- | po/de.po | 2 | ||||
-rw-r--r-- | po/es.po | 2 | ||||
-rw-r--r-- | po/eu_ES.po | 2 | ||||
-rw-r--r-- | po/fi.po | 2 | ||||
-rw-r--r-- | po/fr.po | 2 | ||||
-rw-r--r-- | po/gl.po | 2 | ||||
-rw-r--r-- | po/hu.po | 2 | ||||
-rw-r--r-- | po/id.po | 2 | ||||
-rw-r--r-- | po/is.po | 2 | ||||
-rw-r--r-- | po/it.po | 2 | ||||
-rw-r--r-- | po/ja.po | 2 | ||||
-rw-r--r-- | po/ko.po | 2 | ||||
-rw-r--r-- | po/no.po | 2 | ||||
-rw-r--r-- | po/pl.po | 2 | ||||
-rw-r--r-- | po/popt.pot | 2 | ||||
-rw-r--r-- | po/pt.po | 2 | ||||
-rw-r--r-- | po/pt_BR.po | 2 | ||||
-rw-r--r-- | po/ro.po | 2 | ||||
-rw-r--r-- | po/ru.po | 2 | ||||
-rw-r--r-- | po/sk.po | 2 | ||||
-rw-r--r-- | po/sl.po | 2 | ||||
-rw-r--r-- | po/sr.po | 2 | ||||
-rw-r--r-- | po/sv.po | 2 | ||||
-rw-r--r-- | po/tr.po | 2 | ||||
-rw-r--r-- | po/uk.po | 2 | ||||
-rw-r--r-- | po/wa.po | 2 | ||||
-rw-r--r-- | po/zh.po | 2 | ||||
-rw-r--r-- | po/zh_CN.GB2312.po | 2 | ||||
-rw-r--r-- | popthelp.c | 35 |
31 files changed, 52 insertions, 43 deletions
@@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" diff --git a/po/eu_ES.po b/po/eu_ES.po index 7bd8231..736af41 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" diff --git a/po/popt.pot b/po/popt.pot index 98699ad..1e7c603 100644 --- a/po/popt.pot +++ b/po/popt.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-0400\n" "PO-Revision-Date: 2002-02-13 18:32+0000\n" "Last-Translator: Pedro Morais <morais@kde.org>\n" "Language-Team: pt <morais@kde.org>\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7bd8231..736af41 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index b7cf54c..6522f81 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.3\n" -"POT-Creation-Date: 2002-07-25 11:05-0400\n" +"POT-Creation-Date: 2002-07-25 14:27-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" @@ -521,24 +521,26 @@ static int singleOptionUsage(FILE * fp, int cursor, /*@globals fileSystem @*/ /*@modifies *fp, fileSystem @*/ { - int len = 3; + int len = 4; char shortStr[2] = { '\0', '\0' }; const char * item = shortStr; const char * argDescrip = getArgDescrip(opt, translation_domain); -fprintf(stderr, "*** singleOptionUsage(%p,%d,%p,%p)\n", fp, cursor, opt, translation_domain); - if (opt->shortName!= '\0' ) { - if (!(opt->argInfo & POPT_ARG_MASK)) - return cursor; /* we did these already */ + if (opt->shortName != '\0' && opt->longName != NULL) { + len += 2; + if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++; + len += strlen(opt->longName); + } else if (opt->shortName != '\0') { len++; shortStr[0] = opt->shortName; shortStr[1] = '\0'; } else if (opt->longName) { - len += 1 + strlen(opt->longName); + len += strlen(opt->longName); + if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++; item = opt->longName; } - if (len == 3) return cursor; + if (len == 4) return cursor; if (argDescrip) len += strlen(argDescrip) + 1; @@ -548,11 +550,19 @@ fprintf(stderr, "*** singleOptionUsage(%p,%d,%p,%p)\n", fp, cursor, opt, transla cursor = 7; } - fprintf(fp, " [-%s%s%s%s]", - ((opt->shortName || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) ? "" : "-"), - item, - (argDescrip ? (opt->shortName != '\0' ? " " : "=") : ""), - (argDescrip ? argDescrip : "")); + if (opt->shortName && opt->longName) { + fprintf(fp, " [-%c|-%s%s%s%s]", + opt->shortName, ((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "" : "-"), + opt->longName, + (argDescrip ? " " : ""), + (argDescrip ? argDescrip : "")); + } else { + fprintf(fp, " [-%s%s%s%s]", + ((opt->shortName || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) ? "" : "-"), + item, + (argDescrip ? (opt->shortName != '\0' ? " " : "=") : ""), + (argDescrip ? argDescrip : "")); + } return cursor + len + 1; } @@ -603,7 +613,6 @@ static int singleTableUsage(poptContext con, FILE * fp, /*@globals fileSystem @*/ /*@modifies *fp, fileSystem @*/ { -fprintf(stderr, "*** singleTableUsage(%p,%p,%d,%p,%p)\n", con, fp, cursor, opt, translation_domain); /*@-branchstate@*/ /* FIX: W2DO? */ if (opt != NULL) for (; (opt->longName || opt->shortName || opt->arg) ; opt++) { |