diff options
| author | jbj <jbj> | 2007-05-25 17:36:23 +0000 |
|---|---|---|
| committer | jbj <jbj> | 2007-05-25 17:36:23 +0000 |
| commit | ec792554dd2801ce0018514e40634d7f09c196a8 (patch) | |
| tree | 3f4b354e609f52e5d86f527ceabda855182cc0fe | |
| parent | d6dbbd6d5981675f2bbf0fbc7e32c005c5e95a1d (diff) | |
| download | libpopt-ec792554dd2801ce0018514e40634d7f09c196a8.tar.gz | |
Bring in rpm.org changes to HEAD.
| -rw-r--r-- | ABOUT-NLS | 1107 | ||||
| -rw-r--r-- | Doxyfile.in | 1252 | ||||
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rwxr-xr-x | configure.ac | 56 | ||||
| -rw-r--r-- | findme.c | 4 | ||||
| -rw-r--r-- | intl/Makefile.in | 417 | ||||
| -rw-r--r-- | po/ChangeLog | 14 | ||||
| -rw-r--r-- | po/Makefile.in.in | 389 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/cs.po | 60 | ||||
| -rw-r--r-- | po/da.po | 60 | ||||
| -rw-r--r-- | po/de.po | 127 | ||||
| -rw-r--r-- | po/es.po | 62 | ||||
| -rw-r--r-- | po/eu_ES.po | 62 | ||||
| -rw-r--r-- | po/fi.po | 62 | ||||
| -rw-r--r-- | po/fr.po | 60 | ||||
| -rw-r--r-- | po/gl.po | 60 | ||||
| -rw-r--r-- | po/hu.po | 60 | ||||
| -rw-r--r-- | po/id.po | 62 | ||||
| -rw-r--r-- | po/is.po | 60 | ||||
| -rw-r--r-- | po/it.po | 62 | ||||
| -rw-r--r-- | po/ja.po | 127 | ||||
| -rw-r--r-- | po/ko.po | 60 | ||||
| -rw-r--r-- | po/no.po | 60 | ||||
| -rw-r--r-- | po/pl.po | 66 | ||||
| -rw-r--r-- | po/popt.pot | 62 | ||||
| -rw-r--r-- | po/pt.po | 60 | ||||
| -rw-r--r-- | po/pt_BR.po | 62 | ||||
| -rw-r--r-- | po/ro.po | 60 | ||||
| -rw-r--r-- | po/ru.po | 60 | ||||
| -rw-r--r-- | po/sk.po | 60 | ||||
| -rw-r--r-- | po/sl.po | 60 | ||||
| -rw-r--r-- | po/sr.po | 62 | ||||
| -rw-r--r-- | po/sv.po | 60 | ||||
| -rw-r--r-- | po/tr.po | 60 | ||||
| -rw-r--r-- | po/uk.po | 60 | ||||
| -rw-r--r-- | po/wa.po | 60 | ||||
| -rw-r--r-- | po/zh.po | 62 | ||||
| -rw-r--r-- | po/zh_CN.po | 135 | ||||
| -rw-r--r-- | po/zh_TW.po | 136 | ||||
| -rw-r--r-- | popt.c | 182 | ||||
| -rw-r--r-- | popt.h | 99 | ||||
| -rw-r--r-- | popt.spec | 2 | ||||
| -rw-r--r-- | poptconfig.c | 16 | ||||
| -rw-r--r-- | popthelp.c | 81 | ||||
| -rw-r--r-- | poptint.h | 8 | ||||
| -rw-r--r-- | poptparse.c | 14 | ||||
| -rw-r--r-- | system.h | 4 | ||||
| -rw-r--r-- | test1.c | 8 | ||||
| -rw-r--r-- | test3.c | 4 | ||||
| -rwxr-xr-x | testit.sh | 4 |
51 files changed, 4100 insertions, 1747 deletions
@@ -1,10 +1,11 @@ -Notes on the Free Translation Project -************************************* +1 Notes on the Free Translation Project +*************************************** - Free software is going international! The Free Translation Project -is a way to get maintainers of free software, translators, and users all -together, so that will gradually become able to speak many languages. -A few packages already provide translations for their messages. +Free software is going international! The Free Translation Project is +a way to get maintainers of free software, translators, and users all +together, so that free software will gradually become able to speak many +languages. A few packages already provide translations for their +messages. If you found this `ABOUT-NLS' file inside a distribution, you may assume that the distributed package does use GNU `gettext' internally, @@ -15,17 +16,17 @@ this package with messages translated. Installers will find here some useful hints. These notes also explain how users should proceed for getting the programs to use the available translations. They tell how people wanting to contribute and -work at translations should contact the appropriate team. +work on translations can contact the appropriate team. When reporting bugs in the `intl/' directory or bugs which may be related to internationalization, you should tell about the version of `gettext' which is used. The information can be found in the `intl/VERSION' file, in internationalized packages. -Quick configuration advice -========================== +1.1 Quick configuration advice +============================== - If you want to exploit the full power of internationalization, you +If you want to exploit the full power of internationalization, you should configure it using ./configure --with-included-gettext @@ -45,37 +46,37 @@ to change to GNU `gettext' as soon as possible. you have installed a recent copy of the GNU gettext package with the included `libintl'. -INSTALL Matters -=============== +1.2 INSTALL Matters +=================== - Some packages are "localizable" when properly installed; the -programs they contain can be made to speak your own native language. -Most such packages use GNU `gettext'. Other packages have their own -ways to internationalization, predating GNU `gettext'. +Some packages are "localizable" when properly installed; the programs +they contain can be made to speak your own native language. Most such +packages use GNU `gettext'. Other packages have their own ways to +internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the GNU `gettext' own -library will be used. This library is wholly contained within this -package, usually in the `intl/' subdirectory, so prior installation of -the GNU `gettext' package is _not_ required. Installers may use -special options at configuration time for changing the default -behaviour. The commands: +provides the GNU `gettext' functions. If not, the included GNU +`gettext' library will be used. This library is wholly contained +within this package, usually in the `intl/' subdirectory, so prior +installation of the GNU `gettext' package is _not_ required. +Installers may use special options at configuration time for changing +the default behaviour. The commands: ./configure --with-included-gettext ./configure --disable-nls -will respectively bypass any pre-existing `gettext' to use the +will, respectively, bypass any pre-existing `gettext' to use the internationalizing routines provided within this package, or else, _totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might be not what is desirable. You -should use the more recent version of the GNU `gettext' library. I.e. -if the file `intl/VERSION' shows that the library which comes with this -package is more recent, you should use +will decide to use this. This might not be desirable. You should use +the more recent version of the GNU `gettext' library. I.e. if the file +`intl/VERSION' shows that the library which comes with this package is +more recent, you should use ./configure --with-included-gettext @@ -86,7 +87,7 @@ and therefore it will not be used. The reason is that even an emulation of `gettext' on top of `catgets' could not provide all the extensions of the GNU `gettext' library. - Internationalized packages have usually many `po/LL.po' files, where + Internationalized packages usually have many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless translations have been forbidden at `configure' time by using the `--disable-nls' switch, all available translations are installed @@ -95,10 +96,10 @@ may be set, prior to configuration, to limit the installed set. `LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. -Using This Package -================== +1.3 Using This Package +====================== - As a user, if your language has been installed for this package, you +As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate `LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, and `CC' is an ISO 3166 two-letter country code. For example, let's @@ -113,6 +114,13 @@ But in fact, some languages have dialects in different countries. For example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The country code serves to distinguish the dialects. + The locale naming convention of `LL_CC', with `LL' denoting the +language and `CC' denoting the country, is the one use on systems based +on GNU libc. On other systems, some variations of this scheme are +used, such as `LL' or `LL_CC.ENCODING'. You can get the list of +locales supported by your system for your language by running the +command `locale -a | grep '^LL''. + Not all programs have translations for all languages. By default, an English message is shown in place of a nonexistent translation. If you understand other languages, you can set up a priority list of languages. @@ -124,16 +132,23 @@ system libraries. For example, some Swedish users who would rather read translations in German than English for when Swedish is not available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + Special advice for Norwegian users: The language code for Norwegian +bokma*l changed from `no' to `nb' recently (in 2003). During the +transition period, while some message catalogs for this language are +installed under `nb' and some older ones under `no', it's recommended +for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and +older translations are used. + In the `LANGUAGE' environment variable, but not in the `LANG' environment variable, `LL_CC' combinations can be abbreviated as `LL' to denote the language's main dialect. For example, `de' is equivalent to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' (Portuguese as spoken in Portugal) in this context. -Translating Teams -================= +1.4 Translating Teams +===================== - For the Free Translation Project to be a success, we need interested +For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of @@ -157,135 +172,897 @@ get started, please write to `translation@iro.umontreal.ca' to reach the coordinator for all translator teams. The English team is special. It works at improving and uniformizing -the terminology in use. Proven linguistic skill are praised more than -programming skill, here. +the terminology in use. Proven linguistic skills are praised more than +programming skills, here. -Available Packages -================== +1.5 Available Packages +====================== - Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of September -2001. The matrix shows, in regard of each package, for which languages +Languages are not equally supported in all packages. The following +matrix shows the current state of internationalization, as of October +2006. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files bg cs da de el en eo es et fi fr gl he hr id it ja - +----------------------------------------------------+ - a2ps | [] [] [] | - bash | [] [] [] [] | - bfd | | - binutils | [] | - bison | [] [] [] [] [] | - clisp | [] [] [] [] | - cpio | [] [] [] [] [] | - diffutils | [] [] [] [] [] [] [] | - enscript | [] [] | - error | [] [] | - fetchmail | | - fileutils | [] [] [] [] [] [] [] [] | - findutils | [] [] [] [] [] [] [] [] | - flex | [] [] [] | - freetype | | - gas | | - gawk | [] [] | - gcal | | - gcc | | - gettext | [] [] [] [] [] [] [] [] [] [] | - gnupg | [] [] [] [] [] [] [] | - gprof | | - grep | [] [] [] [] [] [] [] [] | - hello | [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] | - indent | [] [] [] [] [] | - jpilot | [] | - kbd | | - ld | [] | - libc | [] [] [] [] [] [] [] [] | - lilypond | [] | - lynx | [] [] [] [] | - m4 | [] [] [] [] [] [] [] [] | - make | [] [] [] [] [] [] | - mysecretdiary | [] | - nano | [] [] [] | - opcodes | | - parted | [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - recode | [] [] [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - sketch | | - soundtracker | [] [] [] | - sp | | - tar | [] [] [] [] [] [] [] [] | - texinfo | [] [] [] [] [] [] | - textutils | [] [] [] [] [] [] [] [] | - util-linux | [] [] | - wdiff | [] [] [] | - wget | [] [] [] [] [] [] [] [] [] [] | - +----------------------------------------------------+ - bg cs da de el en eo es et fi fr gl he hr id it ja - 0 14 24 32 11 1 8 23 13 1 33 22 4 0 7 9 18 - - ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh - +----------------------------------------------------+ - a2ps | [] [] [] | 6 - bash | | 4 - bfd | | 0 - binutils | | 1 - bison | [] | 6 - clisp | [] | 5 - cpio | [] [] [] [] [] | 10 - diffutils | [] [] [] [] | 11 - enscript | [] [] [] | 5 - error | [] [] | 4 - fetchmail | | 0 - fileutils | [] [] [] [] [] [] [] [] [] | 17 - findutils | [] [] [] [] [] [] [] [] | 16 - flex | [] [] [] | 6 - freetype | | 0 - gas | | 0 - gawk | [] | 3 - gcal | | 0 - gcc | | 0 - gettext | [] [] [] [] [] [] [] [] | 18 - gnupg | [] [] [] | 10 - gprof | | 0 - grep | [] [] [] [] | 12 - hello | [] [] [] [] [] [] [] [] [] [] [] | 22 - id-utils | [] [] [] | 6 - indent | [] [] [] [] [] [] [] | 12 - jpilot | | 1 - kbd | [] | 1 - ld | | 1 - libc | [] [] [] [] [] [] [] [] | 16 - lilypond | [] [] | 3 - lynx | [] [] [] [] | 8 - m4 | [] [] [] [] | 12 - make | [] [] [] [] [] [] | 12 - mysecretdiary | | 1 - nano | [] | 4 - opcodes | [] | 1 - parted | [] [] | 5 - ptx | [] [] [] [] [] [] [] [] | 15 - python | | 0 - recode | [] [] [] [] | 13 - sed | [] [] [] [] [] [] [] | 19 - sh-utils | [] [] [] [] [] [] [] [] [] [] [] | 21 - sharutils | [] [] [] | 11 - sketch | | 0 - soundtracker | | 3 - sp | | 0 - tar | [] [] [] [] [] [] [] | 15 - texinfo | [] | 7 - textutils | [] [] [] [] [] [] [] [] | 16 - util-linux | [] [] | 4 - wdiff | [] [] [] [] | 7 - wget | [] [] [] [] [] [] [] | 17 - +----------------------------------------------------+ - 33 teams ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh - 53 domains 9 1 6 20 0 6 17 1 13 25 10 11 23 21 2 2 387 + Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo + +----------------------------------------------------+ + GNUnet | [] | + a2ps | [] [] [] [] [] | + aegis | () | + ant-phone | () | + anubis | [] | + ap-utils | | + aspell | [] [] [] [] [] | + bash | [] [] [] | + batchelor | [] | + bfd | | + bibshelf | [] | + binutils | [] | + bison | [] [] | + bison-runtime | | + bluez-pin | [] [] [] [] [] | + cflow | [] | + clisp | [] [] | + console-tools | [] [] | + coreutils | [] [] [] | + cpio | | + cpplib | [] [] [] | + cryptonit | [] | + darkstat | [] () [] | + dialog | [] [] [] [] [] [] | + diffutils | [] [] [] [] [] [] | + doodle | [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + error | [] [] [] [] | + fetchmail | [] [] () [] | + fileutils | [] [] | + findutils | [] [] [] | + flex | [] [] [] | + fslint | [] | + gas | | + gawk | [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] | + gimp-print | [] [] [] [] | + gip | [] | + gliv | [] | + glunarclock | [] | + gmult | [] [] | + gnubiff | () | + gnucash | () () [] | + gnucash-glossary | [] () | + gnuedu | | + gnulib | [] [] [] [] [] [] | + gnunet-gtk | | + gnutls | | + gpe-aerial | [] [] | + gpe-beam | [] [] | + gpe-calendar | | + gpe-clock | [] [] | + gpe-conf | [] [] | + gpe-contacts | | + gpe-edit | [] | + gpe-filemanager | | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] | + gpe-package | | + gpe-sketchbook | [] [] | + gpe-su | [] [] | + gpe-taskmanager | [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | | + gphoto2 | [] [] [] [] | + gprof | [] [] | + gpsdrive | () () | + gramadoir | [] [] | + grep | [] [] [] [] [] [] | + gretl | | + gsasl | | + gss | | + gst-plugins | [] [] [] [] | + gst-plugins-base | [] [] [] | + gst-plugins-good | [] [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] [] [] | + gtick | () | + gtkam | [] [] [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] | + id-utils | [] [] | + impost | | + indent | [] [] [] | + iso_3166 | [] [] | + iso_3166_2 | | + iso_4217 | [] | + iso_639 | [] [] | + jpilot | [] | + jtag | | + jwhois | | + kbd | [] [] [] [] | + keytouch | | + keytouch-editor | | + keytouch-keyboa... | | + latrine | () | + ld | [] | + leafpad | [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | [] | + libgpewidget | [] [] [] | + libgpg-error | [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] | + libgsasl | | + libiconv | [] [] | + libidn | [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | [] | + make | [] [] | + man-db | [] () [] [] | + minicom | [] [] [] | + mysecretdiary | [] [] | + nano | [] [] [] | + nano_1_0 | [] () [] [] | + opcodes | [] | + parted | | + pilot-qof | [] | + psmisc | [] | + pwdutils | | + python | | + qof | | + radius | [] | + recode | [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] | + sed | [] [] [] | + sh-utils | [] [] | + shared-mime-info | [] [] [] [] | + sharutils | [] [] [] [] [] [] | + shishi | | + silky | | + skencil | [] () | + sketch | [] () | + solfege | | + soundtracker | [] [] | + sp | [] | + stardict | [] | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] | + texinfo | [] [] [] | + textutils | [] [] [] | + tin | () () | + tp-robot | [] | + tuxpaint | [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] | + vorbis-tools | [] [] [] [] | + wastesedge | () | + wdiff | [] [] [] [] | + wget | [] [] | + xchat | [] [] [] [] [] [] | + xkeyboard-config | | + xpad | [] [] | + +----------------------------------------------------+ + af am ar az be bg bs ca cs cy da de el en en_GB eo + 10 0 1 2 9 22 1 42 41 2 60 95 16 1 17 16 + + es et eu fa fi fr ga gl gu he hi hr hu id is it + +--------------------------------------------------+ + GNUnet | | + a2ps | [] [] [] () | + aegis | | + ant-phone | [] | + anubis | [] | + ap-utils | [] [] | + aspell | [] [] [] | + bash | [] [] [] | + batchelor | [] [] | + bfd | [] | + bibshelf | [] [] [] | + binutils | [] [] [] | + bison | [] [] [] [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + cflow | [] | + clisp | [] [] | + console-tools | | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + cpplib | [] [] | + cryptonit | [] | + darkstat | [] () [] [] [] | + dialog | [] [] [] [] [] [] [] [] | + diffutils | [] [] [] [] [] [] [] [] [] | + doodle | [] [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + error | [] [] [] [] [] | + fetchmail | [] | + fileutils | [] [] [] [] [] [] | + findutils | [] [] [] [] | + flex | [] [] [] | + fslint | [] | + gas | [] [] | + gawk | [] [] [] [] | + gbiff | [] | + gcal | [] [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] [] | + gip | [] [] [] | + gliv | () | + glunarclock | [] [] [] | + gmult | [] [] [] | + gnubiff | () () | + gnucash | () () () | + gnucash-glossary | [] [] | + gnuedu | [] | + gnulib | [] [] [] [] [] [] [] [] | + gnunet-gtk | | + gnutls | | + gpe-aerial | [] [] | + gpe-beam | [] [] | + gpe-calendar | | + gpe-clock | [] [] [] [] | + gpe-conf | [] | + gpe-contacts | [] [] | + gpe-edit | [] [] [] [] | + gpe-filemanager | [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] | + gphoto2 | [] [] [] [] [] | + gprof | [] [] [] [] | + gpsdrive | () () [] () | + gramadoir | [] [] | + grep | [] [] [] [] [] [] [] [] [] [] [] [] | + gretl | [] [] [] | + gsasl | [] [] | + gss | [] | + gst-plugins | [] [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] [] | + gstreamer | [] [] [] | + gtick | [] | + gtkam | [] [] [] [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] [] | + impost | [] [] | + indent | [] [] [] [] [] [] [] [] [] [] | + iso_3166 | [] [] [] | + iso_3166_2 | [] | + iso_4217 | [] [] [] [] | + iso_639 | [] [] [] [] [] | + jpilot | [] [] | + jtag | [] | + jwhois | [] [] [] [] [] | + kbd | [] [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + latrine | [] [] [] | + ld | [] [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | [] | + libgpewidget | [] [] [] [] [] | + libgpg-error | | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] | + libgsasl | [] [] | + libiconv | [] [] | + libidn | [] [] | + lifelines | () | + lilypond | [] | + lingoteach | [] [] [] | + lynx | [] [] [] | + m4 | [] [] [] [] | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] | + man-db | () | + minicom | [] [] [] [] | + mysecretdiary | [] [] [] | + nano | [] [] [] [] [] [] | + nano_1_0 | [] [] [] [] [] | + opcodes | [] [] [] [] | + parted | [] [] [] [] | + pilot-qof | | + psmisc | [] [] [] | + pwdutils | | + python | | + qof | [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] | + shared-mime-info | [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] [] | + shishi | | + silky | [] | + skencil | [] [] | + sketch | [] [] | + solfege | [] | + soundtracker | [] [] [] | + sp | [] | + stardict | [] | + system-tools-ba... | [] [] [] [] [] [] [] [] | + tar | [] [] [] [] [] [] [] | + texinfo | [] [] | + textutils | [] [] [] [] [] | + tin | [] () | + tp-robot | [] [] [] [] | + tuxpaint | [] [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux | [] [] [] [] [] [] [] | + vorbis-tools | [] [] | + wastesedge | () | + wdiff | [] [] [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] [] | + xchat | [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + es et eu fa fi fr ga gl gu he hi hr hu id is it + 88 22 14 2 40 115 61 14 1 8 1 6 59 31 0 52 + + ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no + +-------------------------------------------------+ + GNUnet | | + a2ps | () [] [] () | + aegis | () | + ant-phone | [] | + anubis | [] [] [] | + ap-utils | [] | + aspell | [] [] | + bash | [] | + batchelor | [] [] | + bfd | | + bibshelf | [] | + binutils | | + bison | [] [] [] | + bison-runtime | [] [] [] | + bluez-pin | [] [] [] | + cflow | | + clisp | [] | + console-tools | | + coreutils | [] | + cpio | | + cpplib | [] | + cryptonit | [] | + darkstat | [] [] | + dialog | [] [] | + diffutils | [] [] [] | + doodle | | + e2fsprogs | [] | + enscript | [] | + error | [] | + fetchmail | [] [] | + fileutils | [] [] | + findutils | [] | + flex | [] [] | + fslint | [] [] | + gas | | + gawk | [] [] | + gbiff | [] | + gcal | | + gcc | | + gettext-examples | [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gimp-print | [] [] | + gip | [] [] | + gliv | [] | + glunarclock | [] [] | + gmult | [] [] | + gnubiff | | + gnucash | () () | + gnucash-glossary | [] | + gnuedu | | + gnulib | [] [] [] [] | + gnunet-gtk | | + gnutls | | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] | + gpe-clock | [] [] [] | + gpe-conf | [] [] | + gpe-contacts | [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | [] | + gphoto2 | [] [] | + gprof | | + gpsdrive | () () () | + gramadoir | () | + grep | [] [] [] [] | + gretl | | + gsasl | [] | + gss | | + gst-plugins | [] | + gst-plugins-base | | + gst-plugins-good | [] | + gstreamer | [] | + gtick | | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] | + gutenprint | | + hello | [] [] [] [] [] [] | + id-utils | [] | + impost | | + indent | [] [] | + iso_3166 | [] | + iso_3166_2 | [] | + iso_4217 | [] [] [] | + iso_639 | [] [] | + jpilot | () () () | + jtag | | + jwhois | [] | + kbd | [] | + keytouch | [] | + keytouch-editor | | + keytouch-keyboa... | | + latrine | [] | + ld | | + leafpad | [] [] | + libc | [] [] [] [] [] | + libexif | | + libextractor | | + libgpewidget | [] | + libgpg-error | | + libgphoto2 | [] | + libgphoto2_port | [] | + libgsasl | [] | + libiconv | | + libidn | [] [] | + lifelines | [] | + lilypond | | + lingoteach | [] | + lynx | [] [] | + m4 | [] [] | + mailutils | | + make | [] [] [] | + man-db | () | + minicom | [] | + mysecretdiary | [] | + nano | [] [] [] | + nano_1_0 | [] [] [] | + opcodes | [] | + parted | [] [] | + pilot-qof | | + psmisc | [] [] [] | + pwdutils | | + python | | + qof | | + radius | | + recode | [] | + rpm | [] [] | + screem | [] | + scrollkeeper | [] [] [] [] | + sed | [] [] | + sh-utils | [] [] | + shared-mime-info | [] [] [] [] [] | + sharutils | [] [] | + shishi | | + silky | [] | + skencil | | + sketch | | + solfege | | + soundtracker | | + sp | () | + stardict | [] [] | + system-tools-ba... | [] [] [] [] | + tar | [] [] [] | + texinfo | [] [] [] | + textutils | [] [] [] | + tin | | + tp-robot | [] | + tuxpaint | [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] | + vorbis-tools | [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] | + xchat | [] [] [] [] | + xkeyboard-config | [] | + xpad | [] [] [] | + +-------------------------------------------------+ + ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no + 52 24 2 2 1 3 0 2 3 21 0 15 1 97 5 1 + + nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + +------------------------------------------------------+ + GNUnet | | + a2ps | () [] [] [] [] [] [] | + aegis | () () | + ant-phone | [] [] | + anubis | [] [] [] | + ap-utils | () | + aspell | [] [] | + bash | [] [] [] | + batchelor | [] [] | + bfd | | + bibshelf | [] | + binutils | [] [] | + bison | [] [] [] [] [] | + bison-runtime | [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] [] | + cflow | [] | + clisp | [] | + console-tools | [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + cpplib | [] | + cryptonit | [] [] | + darkstat | [] [] [] [] [] [] | + dialog | [] [] [] [] [] [] [] [] [] | + diffutils | [] [] [] [] [] [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + error | [] [] [] [] | + fetchmail | [] [] [] | + fileutils | [] [] [] [] [] | + findutils | [] [] [] [] [] [] | + flex | [] [] [] [] [] | + fslint | [] [] [] [] | + gas | | + gawk | [] [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] [] | + gimp-print | [] [] | + gip | [] [] [] [] | + gliv | [] [] [] [] | + glunarclock | [] [] [] [] [] [] | + gmult | [] [] [] [] | + gnubiff | () | + gnucash | () [] | + gnucash-glossary | [] [] [] | + gnuedu | | + gnulib | [] [] [] [] [] | + gnunet-gtk | [] | + gnutls | [] [] | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] [] [] [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] [] [] [] | + gpe-login | [] [] [] [] [] [] [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] | + grep | [] [] [] [] [] [] [] [] | + gretl | [] | + gsasl | [] [] [] | + gss | [] [] [] | + gst-plugins | [] [] [] [] | + gst-plugins-base | [] | + gst-plugins-good | [] [] [] [] | + gstreamer | [] [] [] | + gtick | [] | + gtkam | [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] | + impost | [] | + indent | [] [] [] [] [] [] | + iso_3166 | [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] [] [] | + iso_639 | [] [] [] [] | + jpilot | | + jtag | [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + latrine | [] [] | + ld | [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | [] [] | + libgpewidget | [] [] [] [] [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] | + libidn | [] [] () | + lifelines | [] [] | + lilypond | | + lingoteach | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailutils | [] [] [] [] | + make | [] [] [] [] | + man-db | [] [] | + minicom | [] [] [] [] [] | + mysecretdiary | [] [] [] [] | + nano | [] [] [] | + nano_1_0 | [] [] [] [] | + opcodes | [] [] | + parted | [] | + pilot-qof | [] | + psmisc | [] [] | + pwdutils | [] [] | + python | | + qof | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] | + rpm | [] [] [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] | + shared-mime-info | [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + silky | [] | + skencil | [] [] [] | + sketch | [] [] [] | + solfege | [] | + soundtracker | [] [] | + sp | | + stardict | [] [] [] | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] | + tin | () | + tp-robot | [] | + tuxpaint | [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] | + vorbis-tools | [] [] | + wastesedge | | + wdiff | [] [] [] [] [] [] | + wget | [] [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] [] | + xpad | [] [] [] | + +------------------------------------------------------+ + nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + 0 2 3 58 30 54 5 73 72 4 40 46 11 50 128 2 + + tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + +---------------------------------------------------+ + GNUnet | [] | 2 + a2ps | [] [] [] | 19 + aegis | | 0 + ant-phone | [] [] | 6 + anubis | [] [] [] | 11 + ap-utils | () [] | 4 + aspell | [] [] [] | 15 + bash | [] | 11 + batchelor | [] [] | 9 + bfd | | 1 + bibshelf | [] | 7 + binutils | [] [] [] | 9 + bison | [] [] [] | 19 + bison-runtime | [] [] [] | 15 + bluez-pin | [] [] [] [] [] [] | 28 + cflow | [] [] | 5 + clisp | | 6 + console-tools | [] [] | 5 + coreutils | [] [] | 16 + cpio | [] [] [] | 9 + cpplib | [] [] [] [] | 11 + cryptonit | | 5 + darkstat | [] () () | 15 + dialog | [] [] [] [] [] | 30 + diffutils | [] [] [] [] | 28 + doodle | [] | 6 + e2fsprogs | [] [] | 10 + enscript | [] [] [] | 16 + error | [] [] [] [] | 18 + fetchmail | [] [] | 12 + fileutils | [] [] [] | 18 + findutils | [] [] [] | 17 + flex | [] [] | 15 + fslint | [] | 9 + gas | [] | 3 + gawk | [] [] | 15 + gbiff | [] | 5 + gcal | [] | 5 + gcc | [] [] [] | 6 + gettext-examples | [] [] [] [] [] [] | 27 + gettext-runtime | [] [] [] [] [] [] | 28 + gettext-tools | [] [] [] [] [] | 19 + gimp-print | [] [] | 12 + gip | [] [] | 12 + gliv | [] [] | 8 + glunarclock | [] [] [] | 15 + gmult | [] [] [] [] | 15 + gnubiff | [] | 1 + gnucash | () | 2 + gnucash-glossary | [] [] | 9 + gnuedu | [] | 2 + gnulib | [] [] [] [] [] | 28 + gnunet-gtk | | 1 + gnutls | | 2 + gpe-aerial | [] [] | 14 + gpe-beam | [] [] | 14 + gpe-calendar | [] | 3 + gpe-clock | [] [] [] [] | 21 + gpe-conf | [] [] | 14 + gpe-contacts | [] [] | 10 + gpe-edit | [] [] [] [] | 20 + gpe-filemanager | [] | 6 + gpe-go | [] [] | 15 + gpe-login | [] [] [] [] [] | 21 + gpe-ownerinfo | [] [] [] [] | 21 + gpe-package | [] | 6 + gpe-sketchbook | [] [] | 16 + gpe-su | [] [] [] | 20 + gpe-taskmanager | [] [] [] | 20 + gpe-timesheet | [] [] [] [] | 18 + gpe-today | [] [] [] [] [] | 21 + gpe-todo | [] | 7 + gphoto2 | [] [] [] [] | 20 + gprof | [] [] | 11 + gpsdrive | | 4 + gramadoir | [] | 7 + grep | [] [] [] [] | 34 + gretl | | 4 + gsasl | [] [] | 8 + gss | [] | 5 + gst-plugins | [] [] [] | 15 + gst-plugins-base | [] [] [] | 9 + gst-plugins-good | [] [] [] [] [] | 20 + gstreamer | [] [] [] | 17 + gtick | [] | 3 + gtkam | [] | 13 + gtkorphan | [] | 7 + gtkspell | [] [] [] [] [] [] | 26 + gutenprint | | 3 + hello | [] [] [] [] [] | 37 + id-utils | [] [] | 14 + impost | [] | 4 + indent | [] [] [] [] | 25 + iso_3166 | [] [] [] [] | 16 + iso_3166_2 | | 2 + iso_4217 | [] [] | 14 + iso_639 | [] | 14 + jpilot | [] [] [] [] | 7 + jtag | [] | 3 + jwhois | [] [] [] | 13 + kbd | [] [] | 12 + keytouch | [] | 4 + keytouch-editor | | 2 + keytouch-keyboa... | [] | 3 + latrine | [] [] | 8 + ld | [] [] [] [] | 8 + leafpad | [] [] [] [] | 23 + libc | [] [] [] | 23 + libexif | [] | 4 + libextractor | [] | 5 + libgpewidget | [] [] [] | 19 + libgpg-error | [] | 4 + libgphoto2 | [] | 8 + libgphoto2_port | [] [] [] | 11 + libgsasl | [] | 8 + libiconv | [] | 7 + libidn | [] [] | 10 + lifelines | | 4 + lilypond | | 2 + lingoteach | [] | 6 + lynx | [] [] [] | 15 + m4 | [] [] [] | 18 + mailutils | [] | 8 + make | [] [] [] | 20 + man-db | [] | 6 + minicom | [] | 14 + mysecretdiary | [] [] | 12 + nano | [] [] | 17 + nano_1_0 | [] [] [] | 18 + opcodes | [] [] | 10 + parted | [] [] [] | 10 + pilot-qof | [] | 3 + psmisc | [] | 10 + pwdutils | [] | 3 + python | | 0 + qof | [] | 4 + radius | [] | 6 + recode | [] [] [] | 25 + rpm | [] [] [] [] | 14 + screem | [] | 2 + scrollkeeper | [] [] [] [] | 26 + sed | [] [] [] | 22 + sh-utils | [] | 15 + shared-mime-info | [] [] [] [] | 24 + sharutils | [] [] [] | 23 + shishi | | 1 + silky | [] | 4 + skencil | [] | 7 + sketch | | 6 + solfege | | 2 + soundtracker | [] [] | 9 + sp | [] | 3 + stardict | [] [] [] [] | 11 + system-tools-ba... | [] [] [] [] [] [] [] | 37 + tar | [] [] [] [] | 20 + texinfo | [] [] [] | 15 + textutils | [] [] [] | 17 + tin | | 1 + tp-robot | [] [] [] | 10 + tuxpaint | [] [] [] | 16 + unicode-han-tra... | | 0 + unicode-transla... | | 2 + util-linux | [] [] [] | 20 + vorbis-tools | [] [] | 11 + wastesedge | | 1 + wdiff | [] [] | 22 + wget | [] [] [] | 19 + xchat | [] [] [] [] | 29 + xkeyboard-config | [] [] [] [] | 11 + xpad | [] [] [] | 14 + +---------------------------------------------------+ + 77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + 170 domains 0 1 1 77 39 0 136 10 1 48 5 54 0 2028 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -298,15 +1075,15 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If September 2001 seems to be old, you may fetch a more recent copy -of this `ABOUT-NLS' file on most GNU archive sites. The most -up-to-date matrix with full percentage details can be found at + If October 2006 seems to be old, you may fetch a more recent copy of +this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date +matrix with full percentage details can be found at `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. -Using `gettext' in new packages -=============================== +1.6 Using `gettext' in new packages +=================================== - If you are writing a freely available program and want to +If you are writing a freely available program and want to internationalize it you are welcome to use GNU `gettext' in your package. Of course you have to respect the GNU Library General Public License which covers the use of the GNU `gettext' library. This means @@ -315,7 +1092,7 @@ library, whereas only free software can use `libintl' as a static library or use modified versions of `libintl'. Once the sources are changed appropriately and the setup can handle -to use of `gettext' the only thing missing are the translations. The +the use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact diff --git a/Doxyfile.in b/Doxyfile.in index eb92e86..9c521dd 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -1,171 +1,454 @@ -# Doxyfile 1.0.0 +# Doxyfile 1.4.6 -# This file describes the settings to be used by doxygen for a project +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project # # All text after a hash (#) is considered a comment and will be ignored # The format is: # TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] # Values that contain spaces should be placed between quotes (" ") #--------------------------------------------------------------------------- -# General configuration options +# Project related configuration options #--------------------------------------------------------------------------- -# The PROJECT_NAME tag is a single word (or a sequence of word surrounded -# by quotes) that should identify the project. +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. -PROJECT_NAME = @PACKAGE@ +PROJECT_NAME = @PACKAGE@ -# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = @VERSION@ +PROJECT_NUMBER = @VERSION@ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = doxygen +OUTPUT_DIRECTORY = doxygen -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. # The default language is English, other supported languages are: -# Dutch, French, Italian, Czech, Swedish, German and Japanese +# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, +# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, +# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, +# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, +# Swedish, and Ukrainian. -OUTPUT_LANGUAGE = English +OUTPUT_LANGUAGE = English -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. +# This tag can be used to specify the encoding used in the generated output. +# The encoding is not always determined by the language that is chosen, +# but also whether or not the output is meant for Windows or non-Windows users. +# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES +# forces the Windows encoding (this is the default for the Windows binary), +# whereas setting the tag to NO uses a Unix-style encoding (the default for +# all platforms other than Windows). -QUIET = NO +USE_WINDOWS_ENCODING = NO -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. -WARNINGS = YES +BRIEF_MEMBER_DESC = YES -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = @top_srcdir@/ + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = @top_srcdir@/ + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like the Qt-style comments (thus requiring an +# explicit @brief command for a brief description. + +JAVADOC_AUTOBRIEF = YES + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# will output the detailed description near the top, like JavaDoc. +# If set to NO, the detailed description appears after the member +# documentation. + +DETAILS_AT_TOP = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES -DISABLE_INDEX = NO +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. -# If the EXTRACT_ALL tag is set to YES all classes and functions will be -# included in the documentation, even if no documentation was available. +SEPARATE_MEMBER_PAGES = NO -EXTRACT_ALL = YES +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = YES + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes +# will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. -EXTRACT_PRIVATE = NO +EXTRACT_PRIVATE = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members inside documented classes or files. +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. -HIDE_UNDOC_MEMBERS = NO +EXTRACT_STATIC = YES -# If the HIDE_UNDOC_CLASSESS tag is set to YES, Doxygen will hide all -# undocumented classes. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. -HIDE_UNDOC_CLASSES = NO +EXTRACT_LOCAL_CLASSES = YES -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. -BRIEF_MEMBER_DESC = YES +EXTRACT_LOCAL_METHODS = NO -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. -REPEAT_BRIEF = YES +HIDE_UNDOC_MEMBERS = NO -# If the ALWAYS_DETAILS_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. -ALWAYS_DETAILED_SEC = NO +HIDE_UNDOC_CLASSES = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. -FULL_PATH_NAMES = YES +HIDE_FRIEND_COMPOUNDS = NO -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. -STRIP_FROM_PATH = @POPT_SOURCE_PATH@/ +HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation +# The INTERNAL_DOCS tag determines if documentation # that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. +# to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. -INTERNAL_DOCS = NO +INTERNAL_DOCS = YES -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a class diagram (in Html and LaTeX) for classes with base or -# super classes. Setting the tag to NO turns the diagrams off. +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. -CLASS_DIAGRAMS = YES +CASE_SENSE_NAMES = YES -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. -SOURCE_BROWSER = YES +HIDE_SCOPE_NAMES = NO -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. -INLINE_SOURCES = NO +SHOW_INCLUDE_FILES = YES -# If the CASE_SENSE_NAMES tag is set to NO (the default) then Doxygen -# will only generate file names in lower case letters. If set to -# YES upper case letters are also allowed. This is useful if you have -# classes or files whose names only differ in case and if your file system -# supports case sensitive file names. +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. -CASE_SENSE_NAMES = NO +INLINE_INFO = YES -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. -VERBATIM_HEADERS = YES +SORT_MEMBER_DOCS = YES -# If the JAVADOC_AUTOBRIEF tag is set to YES (the default) then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the Javadoc-style will -# behave just like the Qt-style comments. +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. -JAVADOC_AUTOBRIEF = YES +SORT_BRIEF_DOCS = NO -# if the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# reimplements. +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. -INHERIT_DOCS = YES +SORT_BY_SCOPE_NAME = NO -# if the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. -INLINE_INFO = YES +GENERATE_TODOLIST = YES -# the TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. -TAB_SIZE = 8 +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from the +# version control system). Doxygen will invoke the program by executing (via +# popen()) the command <command> <input-file>, where <command> is the value of +# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files @@ -176,300 +459,789 @@ TAB_SIZE = 8 # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = \ - ./findme.c \ - ./findme.h \ - ./popt.c \ - ./popt.h \ - ./poptconfig.c \ - ./popthelp.c \ - ./poptint.h \ - ./poptparse.c \ - ./system.h +INPUT = \ + ./findme.c \ + ./findme.h \ + ./popt.c \ + ./popt.h \ + ./poptconfig.c \ + ./popthelp.c \ + ./poptint.h \ + ./poptparse.c \ + ./system.h # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left -# blank all files are included. +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py -FILE_PATTERNS = *.c *.h +FILE_PATTERNS = *.c \ + *.h -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. -RECURSIVE = NO +RECURSIVE = NO -# The EXCLUDE tag can be used to specify files and/or directories that should +# The EXCLUDE tag can be used to specify files and/or directories that should # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. +EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = # The EXAMPLE_PATH tag can be used to specify one or more files or # directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = +EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO # The IMAGE_PATH tag can be used to specify one or more files or # directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = -# The INPUT_FILTER tag can be used to specify a program that doxygen should +# The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command <filter> <input-file>, where <filter> -# is the value of the INPUT_FILTER tag, and <input-file> is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. +# by executing (via popen()) the command <filter> <input-file>, where <filter> +# is the value of the INPUT_FILTER tag, and <input-file> is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. -INPUT_FILTER = +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. -GENERATE_HTML = YES +GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. -HTML_OUTPUT = +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html # The HTML_HEADER tag can be used to specify a personal HTML header for # each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = +HTML_HEADER = # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user defined cascading +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = +HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to # NO a bullet list will be used. -HTML_ALIGN_MEMBERS = YES +HTML_ALIGN_MEMBERS = YES -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) # of the generated HTML documentation. -GENERATE_HTMLHELP = NO +GENERATE_HTMLHELP = NO -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. -ALPHABETICAL_INDEX = NO +CHM_FILE = -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. -COLS_IN_ALPHA_INDEX = 5 +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. -GENERATE_LATEX = NO +GENERATE_LATEX = NO -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. -LATEX_OUTPUT = +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to # save some trees in general. -COMPACT_LATEX = NO +COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used +# The PAPER_TYPE tag can be used to set the paper type that is used # by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. -PAPER_TYPE = a4wide +PAPER_TYPE = letter -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = +EXTRA_PACKAGES = # The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until +# the generated latex document. The header should contain everything until # the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. -PDF_HYPERLINKS = NO +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages -GENERATE_MAN = YES +GENERATE_MAN = YES -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `man' will be used as the default path. -MAN_OUTPUT = +MAN_OUTPUT = man -# The MAN_EXTENSION tag determines the extension that is added to +# The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) -MAN_EXTENSION = .3 +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include # files. -ENABLE_PREPROCESSING = YES +ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro # names in the source code. If set to NO (the default) only conditional -# compilation will be performed. +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = YES + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. -MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # in the INCLUDE_PATH (see below) will be search if a #include is found. -SEARCH_INCLUDES = YES +SEARCH_INCLUDES = YES -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = +INCLUDE_PATH = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name # or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. -PREDEFINED = +PREDEFINED = -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED tag. +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. -EXPAND_ONLY_PREDEF = NO +EXPAND_AS_DEFINED = -#--------------------------------------------------------------------------- -# Configuration options related to external references -#--------------------------------------------------------------------------- +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. -# The TAGFILES tag can be used to specify one or more tagfiles. +SKIP_FUNCTION_MACROS = YES -TAGFILES = +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- -# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. -GENERATE_TAGFILE = +GENERATE_TAGFILE = Doxytags -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes # will be listed. -ALLEXTERNALS = NO +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES -# The PERL_PATH should be the absolute path and name of the perl script +# The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). -PERL_PATH = /usr/bin/perl +PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- -# Configuration options related to the search engine +# Configuration options related to the dot tool #--------------------------------------------------------------------------- -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. -SEARCHENGINE = NO +CLASS_GRAPH = YES -# The CGI_NAME tag should be the name of the CGI script that -# starts the search engine (doxysearch) with the correct parameters. -# A script with this name will be generated by doxygen. +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. -CGI_NAME = search.cgi +COLLABORATION_GRAPH = YES -# The CGI_URL tag should be the absolute URL to the directory where the -# cgi binaries are located. See the documentation of your http daemon for -# details. +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies -CGI_URL = +GROUP_GRAPHS = YES -# The DOC_URL tag should be the absolute URL to the directory where the -# documentation is located. If left blank the absolute path to the -# documentation, with file:// prepended to it, will be used. +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. -DOC_URL = +UML_LOOK = NO -# The DOC_ABSPATH tag should be the absolute path to the directory where the -# documentation is located. If left blank the directory on the local machine -# will be used. +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. -DOC_ABSPATH = +TEMPLATE_RELATIONS = YES -# The BIN_ABSPATH tag must point to the directory where the doxysearch binary -# is installed. +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. -BIN_ABSPATH = /usr/local/bin/ +INCLUDE_GRAPH = YES -# The EXT_DOC_PATHS tag can be used to specify one or more paths to -# documentation generated for other projects. This allows doxysearch to search -# the documentation for these projects as well. +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_WIDTH = 1024 + +# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_HEIGHT = 1024 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that a graph may be further truncated if the graph's +# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH +# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), +# the graph is not depth-constrained. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, which results in a white background. +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. -EXT_DOC_PATHS = +SEARCHENGINE = NO diff --git a/Makefile.am b/Makefile.am index af97931..63ce37f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,12 +4,12 @@ AUTOMAKE_OPTIONS = 1.4 foreign LINT = splint -EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \ +EXTRA_DIST = config.rpath m4/ChangeLog autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \ testit.sh test-poptrc test3-data/0* \ po/*.in po/*.po po/popt.pot \ popt.ps -SUBDIRS = intl po +SUBDIRS = po INCLUDES = -I. -I$(top_srcdir) @@ -38,15 +38,19 @@ include_HEADERS = popt.h usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = libpopt.la -libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c -libpopt_la_LDFLAGS = @INTLLIBS@ +libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c +libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ + +if HAVE_LD_VERSION_SCRIPT +libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers +endif man_MANS = popt.3 #BUILT_SOURCES = popt.lcd popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS} - $(LINT) -dump $@ ${libpopt_la_SOURCES} + lclint -dump $@ ${libpopt_la_SOURCES} .PHONY: sources sources: @@ -80,3 +84,5 @@ doxygen: Doxyfile rm -rf doxygen mkdir -p doxygen doxygen + +ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 28b2611..073d8e7 100755 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,16 @@ AC_INIT(popt.h) AC_CANONICAL_SYSTEM AC_PREREQ(2.12) -AC_CONFIG_HEADERS -AM_INIT_AUTOMAKE(popt, 1.10.2) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE(popt, 1.10.9) + +# Library code modified: REVISION++ +# Interfaces changed/added/removed: CURRENT++ REVISION=0 +# Interfaces added: AGE++ +# Interfaces removed: AGE=0 +AC_SUBST(LT_CURRENT, 0) +AC_SUBST(LT_REVISION, 0) +AC_SUBST(LT_AGE, 8) ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN zh_TW" @@ -53,24 +60,33 @@ AC_SUBST(TARGET) dnl XXX Choose /usr/lib or /usr/lib64 for library installs. MARK64= -case "${target_cpu}" in -x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;; -esac +if ! echo "${libdir}" | grep -q '64$' ; then + case "${target_cpu}" in + x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;; + esac +fi AC_SUBST(MARK64) AC_CHECK_HEADERS(alloca.h float.h libintl.h mcheck.h unistd.h) -AC_MSG_CHECKING(for /usr/ucblib in LIBS) -if test -d /usr/ucblib ; then - if test "$build" = "mips-sni-sysv4" ; then - addlib /usr/ccs/lib -lc - fi - - addlib /usr/ucblib - - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi + +# For some systems we know that we have ld_version scripts. +# Use it then as default. +have_ld_version_script=no +case "${host}" in + *-*-linux*) + have_ld_version_script=yes + ;; + *-*-gnu*) + have_ld_version_script=yes + ;; +esac +AC_ARG_ENABLE([ld-version-script], + AC_HELP_STRING([--enable-ld-version-script], + [enable/disable use of linker version script. + (default is system dependent)]), + [have_ld_version_script=$enableval], + [ : ] ) +AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") if test ! -f ../rpm.c then @@ -87,11 +103,11 @@ AC_CHECK_FUNC(setreuid, [], [ AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror) -AM_GNU_GETTEXT +AM_GNU_GETTEXT([external]) POPT_SOURCE_PATH="`pwd`" AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH", [Full path to popt top_srcdir.]) AC_SUBST(POPT_SOURCE_PATH) -AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in]) +AC_OUTPUT([Doxyfile Makefile po/Makefile.in intl/Makefile]) @@ -29,7 +29,7 @@ const char * findProgramPath(const char * argv0) strcpy(pathbuf, path); chptr = NULL; - /*@-branchstate@*/ +/*@-branchstate@*/ do { if ((chptr = strchr(start, ':'))) *chptr = '\0'; @@ -43,7 +43,7 @@ const char * findProgramPath(const char * argv0) else start = NULL; } while (start && *start); - /*@=branchstate@*/ +/*@=branchstate@*/ free(buf); diff --git a/intl/Makefile.in b/intl/Makefile.in index 5b1cf2f..525922e 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -1,5 +1,5 @@ -# Makefile for directory with message catalog handling in GNU NLS Utilities. -# Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. +# Makefile for directory with message catalog handling library of GNU gettext +# Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU Library General Public License as published @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU Library General Public # License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. PACKAGE = @PACKAGE@ @@ -24,13 +24,25 @@ SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = .. -VPATH = @srcdir@ + +# The VPATH variables allows builds with $builddir != $srcdir, assuming a +# 'make' program that supports VPATH (such as GNU make). This line is removed +# by autoconf automatically when "$(srcdir)" = ".". +# In this directory, the VPATH handling is particular: +# 1. If INTL_LIBTOOL_SUFFIX_PREFIX is 'l' (indicating a build with libtool), +# the .c -> .lo rules carefully use $(srcdir), so that VPATH can be omitted. +# 2. If PACKAGE = gettext-tools, VPATH _must_ be omitted, because otherwise +# 'make' does the wrong thing if GNU gettext was configured with +# "./configure --srcdir=`pwd`", namely it gets confused by the .lo and .la +# files it finds in srcdir = ../../gettext-runtime/intl. +VPATH = $(srcdir) prefix = @prefix@ exec_prefix = @exec_prefix@ transform = @program_transform_name@ libdir = @libdir@ includedir = @includedir@ +datarootdir = @datarootdir@ datadir = @datadir@ localedir = $(datadir)/locale gettextsrcdir = $(datadir)/gettext/intl @@ -39,8 +51,18 @@ subdir = intl INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` + +# We use $(mkdir_p). +# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as +# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, +# @install_sh@ does not start with $(SHELL), so we add it. +# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined +# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake +# versions, $(mkinstalldirs) and $(install_sh) are unused. +mkinstalldirs = $(SHELL) @install_sh@ -d +install_sh = $(SHELL) @install_sh@ +MKDIR_P = @MKDIR_P@ +mkdir_p = @mkdir_p@ l = @INTL_LIBTOOL_SUFFIX_PREFIX@ @@ -51,59 +73,107 @@ RANLIB = @RANLIB@ YACC = @INTLBISON@ -y -d YFLAGS = --name-prefix=__gettext +# -DBUILDING_LIBINTL: Change expansion of LIBINTL_DLL_EXPORTED macro. +# -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro. DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ --DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@ +-DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \ +-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \ +-Dset_relocation_prefix=libintl_set_relocation_prefix \ +-Drelocate=libintl_relocate \ +-DDEPENDS_ON_LIBICONV=1 @DEFS@ CPPFLAGS = @CPPFLAGS@ -CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ +CFLAGS = @CFLAGS@ @CFLAG_VISIBILITY@ +LDFLAGS = @LDFLAGS@ $(LDFLAGS_@WOE32DLL@) +LDFLAGS_yes = -Wl,--export-all-symbols +LDFLAGS_no = +LIBS = @LIBS@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -HEADERS = $(COMHDRS) libgnuintl.h loadinfo.h -COMHDRS = gmo.h gettextP.h hash-string.h plural-exp.h eval-plural.h os2compat.h -SOURCES = $(COMSRCS) intl-compat.c -COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ -finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ -explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \ -plural-exp.c localcharset.c localename.c osdep.c os2compat.c -OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ -finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ -explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \ -plural.$lo plural-exp.$lo localcharset.$lo localename.$lo osdep.$lo -GETTOBJS = intl-compat.$lo +HEADERS = \ + gmo.h \ + gettextP.h \ + hash-string.h \ + loadinfo.h \ + plural-exp.h \ + eval-plural.h \ + localcharset.h \ + lock.h \ + relocatable.h \ + xsize.h \ + printf-args.h printf-args.c \ + printf-parse.h wprintf-parse.h printf-parse.c \ + vasnprintf.h vasnwprintf.h vasnprintf.c \ + os2compat.h \ + libgnuintl.h.in +SOURCES = \ + bindtextdom.c \ + dcgettext.c \ + dgettext.c \ + gettext.c \ + finddomain.c \ + hash-string.c \ + loadmsgcat.c \ + localealias.c \ + textdomain.c \ + l10nflist.c \ + explodename.c \ + dcigettext.c \ + dcngettext.c \ + dngettext.c \ + ngettext.c \ + plural.y \ + plural-exp.c \ + localcharset.c \ + lock.c \ + relocatable.c \ + langprefs.c \ + localename.c \ + log.c \ + printf.c \ + version.c \ + osdep.c \ + os2compat.c \ + intl-exports.c \ + intl-compat.c +OBJECTS = \ + bindtextdom.$lo \ + dcgettext.$lo \ + dgettext.$lo \ + gettext.$lo \ + finddomain.$lo \ + hash-string.$lo \ + loadmsgcat.$lo \ + localealias.$lo \ + textdomain.$lo \ + l10nflist.$lo \ + explodename.$lo \ + dcigettext.$lo \ + dcngettext.$lo \ + dngettext.$lo \ + ngettext.$lo \ + plural.$lo \ + plural-exp.$lo \ + localcharset.$lo \ + lock.$lo \ + relocatable.$lo \ + langprefs.$lo \ + localename.$lo \ + log.$lo \ + printf.$lo \ + version.$lo \ + osdep.$lo \ + intl-compat.$lo DISTFILES.common = Makefile.in \ -config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) +config.charset locale.alias ref-add.sin ref-del.sin export.h \ +$(HEADERS) $(SOURCES) DISTFILES.generated = plural.c DISTFILES.normal = VERSION -DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc +DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc README.woe32 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \ -COPYING.LIB-2 gettext.h libgettext.h plural-eval.c - -# Libtool's library version information for libintl. -# Before making a gettext release, the gettext maintainer must change this -# according to the libtool documentation, section "Library interface versions". -# Maintainers of other packages that include the intl directory must *not* -# change these values. -LTV_CURRENT=2 -LTV_REVISION=1 -LTV_AGE=0 - -.SUFFIXES: -.SUFFIXES: .c .y .o .lo .sin .sed -.c.o: - $(COMPILE) $< -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) $< - -.y.c: - $(YACC) $(YFLAGS) --output $@ $< - rm -f $*.h - -.sin.sed: - sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@ - mv t-$@ $@ - -INCLUDES = -I.. -I. -I$(top_srcdir)/intl +COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h \ +libgnuintl.h_vms Makefile.vms libgnuintl.h.msvc-static \ +libgnuintl.h.msvc-shared Makefile.msvc all: all-@USE_INCLUDED_LIBINTL@ all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed @@ -119,23 +189,125 @@ libintl.a libgnuintl.a: $(OBJECTS) libintl.la libgnuintl.la: $(OBJECTS) $(LIBTOOL) --mode=link \ $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ - $(OBJECTS) @LTLIBICONV@ -lc \ + $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ -lc \ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ -rpath $(libdir) \ -no-undefined -libintl.h: libgnuintl.h - cp $(srcdir)/libgnuintl.h libintl.h +# Libtool's library version information for libintl. +# Before making a gettext release, the gettext maintainer must change this +# according to the libtool documentation, section "Library interface versions". +# Maintainers of other packages that include the intl directory must *not* +# change these values. +LTV_CURRENT=8 +LTV_REVISION=1 +LTV_AGE=0 + +.SUFFIXES: +.SUFFIXES: .c .y .o .lo .sin .sed -charset.alias: config.charset +.c.o: + $(COMPILE) $< + +.y.c: + $(YACC) $(YFLAGS) --output $@ $< + rm -f $*.h + +bindtextdom.lo: $(srcdir)/bindtextdom.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c +dcgettext.lo: $(srcdir)/dcgettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c +dgettext.lo: $(srcdir)/dgettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c +gettext.lo: $(srcdir)/gettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c +finddomain.lo: $(srcdir)/finddomain.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c +hash-string.lo: $(srcdir)/hash-string.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/hash-string.c +loadmsgcat.lo: $(srcdir)/loadmsgcat.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c +localealias.lo: $(srcdir)/localealias.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c +textdomain.lo: $(srcdir)/textdomain.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c +l10nflist.lo: $(srcdir)/l10nflist.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c +explodename.lo: $(srcdir)/explodename.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c +dcigettext.lo: $(srcdir)/dcigettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c +dcngettext.lo: $(srcdir)/dcngettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c +dngettext.lo: $(srcdir)/dngettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c +ngettext.lo: $(srcdir)/ngettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c +plural.lo: $(srcdir)/plural.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c +plural-exp.lo: $(srcdir)/plural-exp.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c +localcharset.lo: $(srcdir)/localcharset.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c +lock.lo: $(srcdir)/lock.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/lock.c +relocatable.lo: $(srcdir)/relocatable.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c +langprefs.lo: $(srcdir)/langprefs.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c +localename.lo: $(srcdir)/localename.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c +log.lo: $(srcdir)/log.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c +printf.lo: $(srcdir)/printf.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c +version.lo: $(srcdir)/version.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/version.c +osdep.lo: $(srcdir)/osdep.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c +intl-compat.lo: $(srcdir)/intl-compat.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c + +ref-add.sed: $(srcdir)/ref-add.sin + sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed + mv t-ref-add.sed ref-add.sed +ref-del.sed: $(srcdir)/ref-del.sin + sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed + mv t-ref-del.sed ref-del.sed + +INCLUDES = -I. -I$(srcdir) -I.. + +libgnuintl.h: $(srcdir)/libgnuintl.h.in + sed -e '/IN_LIBGLOCALE/d' \ + -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ + -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ + -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ + -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ + < $(srcdir)/libgnuintl.h.in \ + | if test '@WOE32DLL@' = yes; then \ + sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/'; \ + else \ + cat; \ + fi \ + | sed -e 's/extern \([^"]\)/extern LIBINTL_DLL_EXPORTED \1/' \ + -e "/#define _LIBINTL_H/r $(srcdir)/export.h" \ + | sed -e 's,@''HAVE_VISIBILITY''@,@HAVE_VISIBILITY@,g' \ + > libgnuintl.h + +libintl.h: $(srcdir)/libgnuintl.h.in + sed -e '/IN_LIBGLOCALE/d' \ + -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ + -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ + -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ + -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ + < $(srcdir)/libgnuintl.h.in > libintl.h + +charset.alias: $(srcdir)/config.charset $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ mv t-$@ $@ check: all -# This installation goal is only used in GNU gettext. Packages which -# only use the library should use install instead. - # We must not install the libintl.h/libintl.a files if we are on a # system which has the GNU gettext() function in its C library or in a # separate library. @@ -143,17 +315,36 @@ check: all # package, you have to use `configure --with-included-gettext'. install: install-exec install-data install-exec: all - if test "$(PACKAGE)" = "gettext" \ - && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ + && test '@USE_INCLUDED_LIBINTL@' = yes; then \ + $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ $(LIBTOOL) --mode=install \ $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ + if test "@RELOCATABLE@" = yes; then \ + dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \ + if test -n "$$dependencies"; then \ + rm -f $(DESTDIR)$(libdir)/libintl.la; \ + fi; \ + fi; \ + else \ + : ; \ + fi + if test "$(PACKAGE)" = "gettext-tools" \ + && test '@USE_INCLUDED_LIBINTL@' = no \ + && test @GLIBC2@ != no; then \ + $(mkdir_p) $(DESTDIR)$(libdir); \ + $(LIBTOOL) --mode=install \ + $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \ + rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ + $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \ + $(LIBTOOL) --mode=uninstall \ + rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \ else \ : ; \ fi if test '@USE_INCLUDED_LIBINTL@' = yes; then \ - test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ + test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \ temp=$(DESTDIR)$(libdir)/t-charset.alias; \ dest=$(DESTDIR)$(libdir)/charset.alias; \ if test -f $(DESTDIR)$(libdir)/charset.alias; then \ @@ -169,7 +360,7 @@ install-exec: all rm -f $$temp; \ fi; \ fi; \ - $(mkinstalldirs) $(DESTDIR)$(localedir); \ + $(mkdir_p) $(DESTDIR)$(localedir); \ test -f $(DESTDIR)$(localedir)/locale.alias \ && orig=$(DESTDIR)$(localedir)/locale.alias \ || orig=$(srcdir)/locale.alias; \ @@ -182,8 +373,8 @@ install-exec: all : ; \ fi install-data: all - if test "$(PACKAGE)" = "gettext"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \ @@ -209,20 +400,27 @@ install-data: all install-strip: install installdirs: - if test "$(PACKAGE)" = "gettext" \ - && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ + && test '@USE_INCLUDED_LIBINTL@' = yes; then \ + $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ + else \ + : ; \ + fi + if test "$(PACKAGE)" = "gettext-tools" \ + && test '@USE_INCLUDED_LIBINTL@' = no \ + && test @GLIBC2@ != no; then \ + $(mkdir_p) $(DESTDIR)$(libdir); \ else \ : ; \ fi if test '@USE_INCLUDED_LIBINTL@' = yes; then \ - test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ - $(mkinstalldirs) $(DESTDIR)$(localedir); \ + test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \ + $(mkdir_p) $(DESTDIR)$(localedir); \ else \ : ; \ fi - if test "$(PACKAGE)" = "gettext"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ else \ : ; \ fi @@ -231,14 +429,21 @@ installdirs: installcheck: uninstall: - if test "$(PACKAGE)" = "gettext" \ - && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ + && test '@USE_INCLUDED_LIBINTL@' = yes; then \ rm -f $(DESTDIR)$(includedir)/libintl.h; \ $(LIBTOOL) --mode=uninstall \ rm -f $(DESTDIR)$(libdir)/libintl.$la; \ else \ : ; \ fi + if test "$(PACKAGE)" = "gettext-tools" \ + && test '@USE_INCLUDED_LIBINTL@' = no \ + && test @GLIBC2@ != no; then \ + rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ + else \ + : ; \ + fi if test '@USE_INCLUDED_LIBINTL@' = yes; then \ if test -f $(DESTDIR)$(libdir)/charset.alias; then \ temp=$(DESTDIR)$(libdir)/t-charset.alias; \ @@ -265,7 +470,7 @@ uninstall: else \ : ; \ fi - if test "$(PACKAGE)" = "gettext"; then \ + if test "$(PACKAGE)" = "gettext-tools"; then \ for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ @@ -273,20 +478,34 @@ uninstall: : ; \ fi -info dvi: +info dvi ps pdf html: $(OBJECTS): ../config.h libgnuintl.h -bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: gettextP.h gmo.h loadinfo.h -dcigettext.$lo: hash-string.h -explodename.$lo l10nflist.$lo: loadinfo.h -dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: plural-exp.h -dcigettext.$lo: eval-plural.h +bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h +hash-string.$lo dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h +explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h +dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h +dcigettext.$lo: $(srcdir)/eval-plural.h +localcharset.$lo: $(srcdir)/localcharset.h +bindtextdom.$lo dcigettext.$lo finddomain.$lo loadmsgcat.$lo localealias.$lo lock.$lo log.$lo: $(srcdir)/lock.h +localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h +printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c + +# A bison-2.1 generated plural.c includes <libintl.h> if ENABLE_NLS. +PLURAL_DEPS_yes = libintl.h +PLURAL_DEPS_no = +plural.$lo: $(PLURAL_DEPS_@USE_INCLUDED_LIBINTL@) tags: TAGS TAGS: $(HEADERS) $(SOURCES) here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) +ctags: CTAGS + +CTAGS: $(HEADERS) $(SOURCES) + here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES) + id: ID ID: $(HEADERS) $(SOURCES) @@ -294,15 +513,15 @@ ID: $(HEADERS) $(SOURCES) mostlyclean: - rm -f *.a *.la *.o *.lo core core.* - rm -f libintl.h charset.alias ref-add.sed ref-del.sed + rm -f *.a *.la *.o *.obj *.lo core core.* + rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed rm -f -r .libs _libs clean: mostlyclean distclean: clean rm -f Makefile ID TAGS - if test "$(PACKAGE)" = gettext; then \ + if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \ rm -f ChangeLog.inst $(DISTFILES.normal); \ else \ : ; \ @@ -317,20 +536,26 @@ maintainer-clean: distclean # other files which should not be distributed in other packages. distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: Makefile - if test "$(PACKAGE)" = gettext; then \ - additional="$(DISTFILES.gettext)"; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + : ; \ else \ - additional="$(DISTFILES.normal)"; \ - fi; \ - $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ - for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ - cp -p $$dir/$$file $(distdir); \ - done - -Makefile: Makefile.in ../config.status - cd .. \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + if test "$(PACKAGE)" = "gettext-runtime"; then \ + additional="$(DISTFILES.gettext)"; \ + else \ + additional="$(DISTFILES.normal)"; \ + fi; \ + $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ + for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \ + done; \ + fi + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status +# This would be more efficient, but doesn't work any more with autoconf-2.57, +# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used. +# cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/po/ChangeLog b/po/ChangeLog index bc697cb..4daed2d 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,6 +1,12 @@ -2002-02-10 gettextize <bug-gnu-utils@gnu.org> +2006-12-08 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.10.40. - * cat-id-tbl.c: Remove file. - * stamp-cat-id: Remove file. + * Makefile.in.in: New file, from gettext-0.16. + * boldquot.sed: New file, from gettext-0.16. + * en@boldquot.header: New file, from gettext-0.16. + * en@quot.header: New file, from gettext-0.16. + * insert-header.sin: New file, from gettext-0.16. + * quot.sed: New file, from gettext-0.16. + * remove-potcdate.sin: New file, from gettext-0.16. + * Rules-quot: New file, from gettext-0.16. + * POTFILES.in: New file. diff --git a/po/Makefile.in.in b/po/Makefile.in.in index f7c63af..5022b8b 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,17 +1,18 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu> +# Makefile for PO directory in any package using GNU gettext. +# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu> # -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU General Public +# License but which still want to provide support for the GNU gettext +# functionality. +# Please note that the actual code of GNU gettext is covered by the GNU +# General Public License and is *not* in the public domain. +# +# Origin: gettext-0.16 PACKAGE = @PACKAGE@ VERSION = @VERSION@ - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ SHELL = /bin/sh @SET_MAKE@ @@ -22,125 +23,290 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ datadir = @datadir@ -localedir = $(datadir)/locale +localedir = @localedir@ gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/mkinstalldirs" ;; esac` -CC = @CC@ -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ +# We use $(mkdir_p). +# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as +# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, +# @install_sh@ does not start with $(SHELL), so we add it. +# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined +# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake +# versions, $(mkinstalldirs) and $(install_sh) are unused. +mkinstalldirs = $(SHELL) @install_sh@ -d +install_sh = $(SHELL) @install_sh@ +MKDIR_P = @MKDIR_P@ +mkdir_p = @mkdir_p@ + +GMSGFMT_ = @GMSGFMT@ +GMSGFMT_no = @GMSGFMT@ +GMSGFMT_yes = @GMSGFMT_015@ +GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) +MSGFMT_ = @MSGFMT@ +MSGFMT_no = @MSGFMT@ +MSGFMT_yes = @MSGFMT_015@ +MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) +XGETTEXT_ = @XGETTEXT@ +XGETTEXT_no = @XGETTEXT@ +XGETTEXT_yes = @XGETTEXT_015@ +XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) MSGMERGE = msgmerge - -DEFS = @DEFS@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ - -INCLUDES = -I.. -I$(top_srcdir)/intl - -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) +MSGMERGE_UPDATE = @MSGMERGE@ --update +MSGINIT = msginit +MSGCONV = msgconv +MSGFILTER = msgfilter POFILES = @POFILES@ GMOFILES = @GMOFILES@ -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ -$(POFILES) $(GMOFILES) +UPDATEPOFILES = @UPDATEPOFILES@ +DUMMYPOFILES = @DUMMYPOFILES@ +DISTFILES.common = Makefile.in.in remove-potcdate.sin \ +$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) +DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ +$(POFILES) $(GMOFILES) \ +$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) POTFILES = \ CATALOGS = @CATALOGS@ -.SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo - -.c.o: - $(COMPILE) $< +# Makevars gets inserted here. (Don't remove this line!) -.po.pox: - $(MAKE) $(PACKAGE).pot - $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox +.SUFFIXES: +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update .po.mo: - $(MSGFMT) -o $@ $< + @echo "$(MSGFMT) -c -o $@ $<"; \ + $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ .po.gmo: - file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< + @lang=`echo $* | sed -e 's,.*/,,'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + +.sin.sed: + sed -e '/^#/d' $< > t-$@ + mv t-$@ $@ all: all-@USE_NLS@ -all-yes: $(CATALOGS) +all-yes: stamp-po all-no: -# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', +# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no +# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because +# we don't want to bother translators with empty POT files). We assume that +# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. +# In this case, stamp-po is a nop (i.e. a phony target). + +# stamp-po is a timestamp denoting the last time at which the CATALOGS have +# been loosely updated. Its purpose is that when a developer or translator +# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent +# invocations of "make" will do nothing. This timestamp would not be necessary +# if updating the $(CATALOGS) would always touch them; however, the rule for +# $(POFILES) has been designed to not touch files that don't need to be +# changed. +stamp-po: $(srcdir)/$(DOMAIN).pot + test ! -f $(srcdir)/$(DOMAIN).pot || \ + test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) + @test ! -f $(srcdir)/$(DOMAIN).pot || { \ + echo "touch stamp-po" && \ + echo timestamp > stamp-poT && \ + mv stamp-poT stamp-po; \ + } + +# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', # otherwise packages like GCC can not be built if only parts of the source # have been downloaded. -$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ - --add-comments --keyword=_ --keyword=N_ --keyword=POPT_ \ +# This target rebuilds $(DOMAIN).pot; it is an expensive operation. +# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ + msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ + else \ + msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ + fi; \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ --files-from=$(srcdir)/POTFILES.in \ - && test ! -f $(PACKAGE).po \ - || ( rm -f $(srcdir)/$(PACKAGE).pot \ - && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address="$$msgid_bugs_address" + test ! -f $(DOMAIN).po || { \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ + else \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + else \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + } + +# This rule has no dependencies: we don't need to update $(DOMAIN).pot at +# every "make" invocation, only create it when it is missing. +# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. +$(srcdir)/$(DOMAIN).pot: + $(MAKE) $(DOMAIN).pot-update + +# This target rebuilds a PO file if $(DOMAIN).pot has changed. +# Note that a PO file is not touched if it doesn't need to be changed. +$(POFILES): $(srcdir)/$(DOMAIN).pot + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + if test -f "$(srcdir)/$${lang}.po"; then \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + else \ + $(MAKE) $${lang}.po-create; \ + fi install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common) Makevars.template; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + for file in Makevars; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ else \ : ; \ fi install-data-no: all install-data-yes: all - $(mkinstalldirs) $(DESTDIR)$(datadir) + $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkinstalldirs) $(DESTDIR)$$dir; \ - if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - echo "installing $(srcdir)/$$cat as" \ - "$(DESTDIR)$$dir/$(PACKAGE).mo"; \ - fi; \ + $(mkdir_p) $(DESTDIR)$$dir; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ + fi; \ + done; \ done -# Define this as empty until I found a useful application. -installcheck: +install-strip: install -uninstall: - catalogs='$(CATALOGS)'; \ +installdirs: installdirs-exec installdirs-data +installdirs-exec: +installdirs-data: installdirs-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi +installdirs-data-no: +installdirs-data-yes: + $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + fi; \ + done; \ done - if test "$(PACKAGE)" = "gettext"; then \ - rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + +# Define this as empty until I found a useful application. +installcheck: + +uninstall: uninstall-exec uninstall-data +uninstall-exec: +uninstall-data: uninstall-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + for file in $(DISTFILES.common) Makevars.template; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ else \ : ; \ fi +uninstall-data-no: +uninstall-data-yes: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + done; \ + done check: all -dvi info tags TAGS ID: +info dvi ps pdf html tags TAGS ctags CTAGS ID: mostlyclean: - rm -f core core.* *.pox $(PACKAGE).po *.new.po + rm -f remove-potcdate.sed + rm -f stamp-poT + rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po rm -fr *.o clean: mostlyclean @@ -151,45 +317,86 @@ distclean: clean maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f $(GMOFILES) + rm -f stamp-po $(GMOFILES) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: $(MAKE) update-po @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. -dist2: $(DISTFILES) +dist2: stamp-po $(DISTFILES) dists="$(DISTFILES)"; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + dists="$$dists Makevars.template"; \ + fi; \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + dists="$$dists $(DOMAIN).pot stamp-po"; \ + fi; \ + if test -f $(srcdir)/ChangeLog; then \ + dists="$$dists ChangeLog"; \ + fi; \ + for i in 0 1 2 3 4 5 6 7 8 9; do \ + if test -f $(srcdir)/ChangeLog.$$i; then \ + dists="$$dists ChangeLog.$$i"; \ + fi; \ + done; \ + if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ - cp -p $$dir/$$file $(distdir); \ + if test -f $$file; then \ + cp -p $$file $(distdir) || exit 1; \ + else \ + cp -p $(srcdir)/$$file $(distdir) || exit 1; \ + fi; \ done update-po: Makefile - $(MAKE) $(PACKAGE).pot - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ + $(MAKE) $(DOMAIN).pot-update + test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) + $(MAKE) update-gmo + +# General rule for creating PO files. + +.nop.po-create: + @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ + echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ + exit 1 + +# General rule for updating PO files. + +.nop.po-update: + @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ - catalogs='$(GMOFILES)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - echo "$$lang:"; \ - if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ - mv -f $$lang.new.po $$lang.po; \ + if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ else \ - echo "msgmerge for $$cat failed!"; \ - rm -f $$lang.new.po; \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + exit 1; \ + fi; \ fi; \ - done - $(MAKE) update-gmo + else \ + echo "msgmerge for $$lang.po failed!" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi + +$(DUMMYPOFILES): update-gmo: Makefile $(GMOFILES) @: -Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in +Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ - $(SHELL) ./config.status + && $(SHELL) ./config.status $(subdir)/$@.in po-directories + +force: # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/po/POTFILES.in b/po/POTFILES.in index a1eddf7..2e2af76 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,6 +4,7 @@ findme.c popt.c +popt.h poptconfig.c popthelp.c poptparse.c @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -14,99 +14,107 @@ msgstr "" msgid "unknown errno" msgstr "neznámé èíslo chyby" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "volba (%d) není v popt implementována\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "chybí argument" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "neznámá volba" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "po¾adovány vzájemnì výluèné logické operace" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "opt->arg nesmí být NULL" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "aliasy vnoøené pøíli¹ hluboko" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "chyba v quotování parametrù" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "chybná numerická hodnota" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "èíslo je pøíli¹ velké nebo pøíli¹ malé" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "selhala alokace pamìti" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "neznámá chyba" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Vypí¹e tuto nápovìdu" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Vypí¹e krátký návod k pou¾ití" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "Zobrazit implicitní volby ve zprávì" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "NONE" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "VAL" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "INT" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "STRING" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLOAT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Pou¾ití:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[VOLBY...]" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -15,100 +15,108 @@ msgstr "" msgid "unknown errno" msgstr "ukendt fejlnr." -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "tilvalgstype (%d) er ikke implementeret i popt\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "mangler argument" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "ukendt tilvalg" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "de ønskede handlinger udelukker hinanden" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "aliaser er for dybt indlejret" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "fejl i parameter citering" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "ugyldig numerisk værdi" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "nummer for stort, eller for lille" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "ukendt fejl" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Vis denne hjælpemeddelelse" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Vis kortfattet brugsanvisning" -#: popthelp.c:79 +#: popthelp.c:83 #, fuzzy msgid "Display option defaults in message" msgstr "Vis kortfattet brugsanvisning" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "INGEN" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "VAL" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "INT" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "STRING" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLOAT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Brug:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[TILVALG...]" @@ -1,117 +1,124 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# Translation of popt to German (Deutsch) +# This file is distributed under the same license as the popt package. +# Robert Scheck <rpm@robert-scheck.de>, 2004-2007. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-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" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" +"PO-Revision-Date: 2007-02-17 21:00+0100\n" +"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n" +"Language-Team: German <de@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" #: popt.c:35 msgid "unknown errno" -msgstr "" +msgstr "Unbekannte Fehler-Nummer" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" -msgstr "" +msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" -msgstr "" +msgstr "Fehlendes Argument" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" -msgstr "" +msgstr "Unbekannte Option" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" -msgstr "" +msgstr "Gegenseitig ausschließende logische Operatoren" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" -msgstr "" +msgstr "opt->arg sollte nicht NULL sein" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" -msgstr "" +msgstr "Aliase zu tief verschachtelt" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" -msgstr "" +msgstr "Fehler beim Quotieren der Parameter" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" -msgstr "" +msgstr "Ungültiger nummerischer Wert" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" -msgstr "" +msgstr "Nummer zu groß oder zu klein" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" -msgstr "" +msgstr "Speicherzuordnung fehlgeschlagen" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" -msgstr "" +msgstr "Unbekannter Fehler" + +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "Optionen über popt alias/exec implementiert:" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:188 +msgid "Help options:" +msgstr "Hilfe-Optionen:" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" -msgstr "" +msgstr "Zeigt diese Hilfe an" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" -msgstr "" +msgstr "Zeigt eine kurze Verwendungsinformation" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" -msgstr "" +msgstr "Zeigt die Standardeinstellungen an" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" -msgstr "" +msgstr "NICHTS" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" -msgstr "" +msgstr "WERT" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" -msgstr "" +msgstr "INTEGER" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" -msgstr "" +msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" -msgstr "" +msgstr "STRING" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" -msgstr "" +msgstr "FLOAT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" -msgstr "" +msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" -msgstr "" +msgstr "ARGUMENT" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" -msgstr "" +msgstr "Verwendung:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" -msgstr "" +msgstr "[OPTION...]" @@ -6,113 +6,121 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: ENCODING\n" #: popt.c:35 msgid "unknown errno" msgstr "errno desconocido" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "tipo de opcin (%d) no implementada en popt\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "falta argumento" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "opcin desconocida" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "requerida operacin lgica mutuamente exclusiva" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "alias anidados muy profundamente" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "error en cita de parmetros" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "valor numrico invlido" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "nmero muy largo o muy pequeo" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "error desconocido" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Muestra este mensaje de ayuda" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Indica el modo de uso resumido" -#: popthelp.c:79 +#: popthelp.c:83 #, fuzzy msgid "Display option defaults in message" msgstr "Indica el modo de uso resumido" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "NONE" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "VAL" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "INT" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "STRING" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLOAT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Modo de Uso:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[OPCIN...]" diff --git a/po/eu_ES.po b/po/eu_ES.po index df3d2ae..78ab7a1 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,112 +6,120 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: ENCODING\n" #: popt.c:35 msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -6,112 +6,120 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: ENCODING\n" #: popt.c:35 msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.8.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" "PO-Revision-Date: 2003-06-22 23:43+0200\n" "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n" "Language-Team: RPM French Translation <rpm-fr@livna.org>\n" @@ -24,99 +24,107 @@ msgstr "" msgid "unknown errno" msgstr "errno inconnu" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "type(%d) d'option non implémenté dans popt\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "argument manquant" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "option iconnue" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "opérations logiques mutuellement exclusives requises" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "opt->arg ne devrait pas être NULL" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "les alias sont trop entremellés" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "erreur en citant les paramètres" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "valeur numérique invalide" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "nombre trop grand ou trop petit" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "échec de l'allocation de mémoire" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "erreur inconnue" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Montre ce message d'aide" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Affiche un bref descriptif de l'utilisation" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "Afficher les valeurs par défaut des options dans le message" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "RIEN" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "VAL" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "ENTIER" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "CHAINE" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLOTTANT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Utilisation:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[OPTION...]" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -14,100 +14,108 @@ msgstr "" msgid "unknown errno" msgstr "errno descoñecido" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "tipo de opción (%d) non implementada en popt\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "falta un argumento" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "opción descoñecida" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "solicitáronse operacións lóxicas mutuamente excluíntes" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "aliases aniñados a un nivel demasiado profundo" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "erro nas comiñas do parámetro" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "valor numérico non válido" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "número demasiado grande ou pequeno" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "erro descoñecido" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Amosar esta mensaxe de axuda" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Amosar brevemente o xeito de utilización" -#: popthelp.c:79 +#: popthelp.c:83 #, fuzzy msgid "Display option defaults in message" msgstr "Amosar brevemente o xeito de utilización" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "NADA" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "VAL" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "INT" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "CADEA" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLOAT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Uso:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[OPCIÓN...]" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -14,100 +14,108 @@ msgstr "" msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "E súgó megjelenítése" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Rövid használati utasítás megjelenítése" -#: popthelp.c:79 +#: popthelp.c:83 #, fuzzy msgid "Display option defaults in message" msgstr "Rövid használati utasítás megjelenítése" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -6,112 +6,120 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: ENCODING\n" #: popt.c:35 msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -14,99 +14,107 @@ msgstr "" msgid "unknown errno" msgstr "óþekkt villunúmer" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "rofagerðin (%d) er ekki studd í popt\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "vantar viðfang" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "óþekktur rofi" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "beðið um rofa sem slökkva hvor á öðrum" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "opt->arg ætti ekki að vera NULL" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "alíasar of flóknir" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "villa í viðföngum (gæsalappir og svo frv.)" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "ógilt tölulegt gildi" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "talan of stór eða smá" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "ekki tókst að taka frá minni" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "óþekkt villa" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Sýna þessa hjálp" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Sýna stuttar notkunarleiðbeiningar" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "Sýna sjálfgefin gildi rofa í skilaboðum" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "ENGIN" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "VAL" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "INT" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "STRING" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLOAT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Notkun:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[ROFI...]" @@ -6,112 +6,120 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: ENCODING\n" #: popt.c:35 msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -1,117 +1,124 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# rpm ja.po +# Copyright (C) 2003 Free Software Foundation, Inc. +# Yukihiro Nakai <ynakai@redhat.com>, 2003 # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-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" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" +"PO-Revision-Date: 2003--8-25 19:00+0900\n" +"Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n" +"Language-Team: Japanese <ja@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" #: popt.c:35 msgid "unknown errno" -msgstr "" +msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ç•ªå·" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" -msgstr "" +msgstr "オプションタイプ (%d) ã¯poptã«ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" -msgstr "" +msgstr "引数ãŒã‚ã‚Šã¾ã›ã‚“" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" -msgstr "" +msgstr "ä¸æ˜Žãªã‚ªãƒ—ション" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" -msgstr "" +msgstr "排他的ãªæ‚ªãºãƒ¼ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãŒå¿…è¦ã§ã™" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" -msgstr "" +msgstr "opt->argã¯NULLã§ã¯ã„ã‘ã¾ã›ã‚“" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" -msgstr "" +msgstr "エイリアスã®ãƒã‚¹ãƒˆãŒæ·±ã™ãŽã¾ã™" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" -msgstr "" +msgstr "パラメータã®ã‚¯ã‚ªãƒ¼ãƒˆä»˜ã‘ã§ã‚¨ãƒ©ãƒ¼" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" -msgstr "" +msgstr "ä¸æ£ãªæ•°å€¤" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" -msgstr "" +msgstr "数値ãŒå¤§ãã™ãŽã‚‹ã‹å°ã•ã™ãŽã¾ã™" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" -msgstr "" +msgstr "メモリ確ä¿ã«å¤±æ•—ã—ã¾ã—ãŸ" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" -msgstr "" +msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼" + +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "poptã®alias/execã§å®Ÿè£…ã•ã‚Œã¦ã„るオプション:" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:188 +msgid "Help options:" +msgstr "ヘルプオプション:" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" -msgstr "" +msgstr "ã“ã®ãƒ˜ãƒ«ãƒ—メッセージを表示ã—ã¾ã™" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" -msgstr "" +msgstr "使ã„æ–¹ã®æ¦‚è¦ã‚’表示ã—ã¾ã™" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" -msgstr "" +msgstr "オプションã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ã‚’メッセージã«è¡¨ç¤ºã—ã¾ã™" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" -msgstr "" +msgstr "ãªã—" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" -msgstr "" +msgstr "値" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" -msgstr "" +msgstr "INT" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" -msgstr "" +msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" -msgstr "" +msgstr "æ–‡å—列" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" -msgstr "" +msgstr "FLOAT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" -msgstr "" +msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" -msgstr "" +msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" -msgstr "" +msgstr "使ã„æ–¹:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" -msgstr "" +msgstr "[オプション...]" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -14,99 +14,107 @@ msgstr "" msgid "unknown errno" msgstr "¾Ë ¼ö ¾ø´Â ¿À·ùÄÚµå(errno) ÀÔ´Ï´Ù" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "¿É¼Ç À¯Çü (%d)Àº popt¿¡¼ »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "¾Ë ¼ö ¾ø´Â ¿É¼ÇÀÔ´Ï´Ù" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "¾çÂÊ¿¡ ¹èŸÀû ³í¸® ¿¬»êÀÌ ÁöÁ¤µÇ¾ú½À´Ï´Ù" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "¿É¼Ç->Àμö°¡ NULLÀÌ µÇ¾î¼´Â ¾ÈµË´Ï´Ù" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "º°Äª(alias)ÀÌ º¹ÀâÇÏ°Ô ¼³Á¤µÇ¾ú½À´Ï´Ù" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "¸Å°³º¯¼ö¿¡ ¿À·ù°¡ ÀÖ½À´Ï´Ù" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "À߸øµÈ ¼öÄ¡ °ªÀÔ´Ï´Ù" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "¼ýÀÚ°¡ ³Ê¹« Å©°Å³ª ³Ê¹« Àû½À´Ï´Ù" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "¸Þ¸ð¸® ÇÒ´ç¿¡ ½ÇÆÐÇß½À´Ï´Ù" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "¾Ë ¼ö ¾ø´Â ¿À·ùÀÔ´Ï´Ù" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "ÀÌ µµ¿ò¸»À» º¸¿©ÁÝ´Ï´Ù" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "°£´ÜÇÑ »ç¿ë¹ýÀ» º¸¿©ÁÝ´Ï´Ù" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "±âº»ÀûÀÎ ¿É¼ÇÀ» º¸¿©ÁÝ´Ï´Ù" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "¾øÀ½(NONE)" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "°ª(VAL)" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "Á¤¼ö(INT)" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "Á¤¼ö(LONG)" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "¹®ÀÚ¿(STRING)" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "¼Ò¼ö(FLOAT)" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "¼Ò¼ö(DOUBLE)" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "Àμö(ARG)" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "»ç¿ë¹ý:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[¿É¼Ç...]" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -14,99 +14,107 @@ msgstr "" msgid "unknown errno" msgstr "ukjent errno" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "flaggtype (%d) ikke implementert i popt\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "manglende argument" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "ukjent flagg" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "gjensidig eksluderende logiske operasjoner forespurt" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "opt->arg må ikke være NULL" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "aliaser med for dype løkker" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "feil i parametersitering" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "ugyldig numerisk verdi" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "tallet er for stort eller lite" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "minneallokering feilet" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "ukjent feil" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Vis denne hjelpmeldingen" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Vis kort bruksmelding" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "Vis forvalgte flagg i melding" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "INGEN" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "VERDI" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "HELTALL" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "STRENG" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLYTTALL" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Bruk:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[FLAGG...]" @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.9-20030515\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" "PO-Revision-Date: 2003-06-08 20:32+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -18,105 +18,107 @@ msgstr "" msgid "unknown errno" msgstr "nieznane errno" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "rodzaj opcji (%d) nie zaimplementowany w popt\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "brak parametru" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "nieznana opcja" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "¿±danie wykluczaj±cych siê operacji" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "opt->arg nie mo¿e byæ NULL" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "zbyt du¿e zag³êbienie aliasów" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "b³±d w cytowaniu parametru" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "b³êdna warto¶æ liczbowa" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "liczba zbyt du¿a lub zbyt ma³a" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "b³±d alokacji pamiêci" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "nieznany b³±d" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "Opcje zaimplementowane poprzez popt alias/exec:" + +#: popt.h:188 +msgid "Help options:" +msgstr "Opcje pomocy:" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Poka¿ tê pomoc" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Wy¶wietl skrócony sposób u¿ycia" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "Wy¶wietl domy¶lne opcje w opisie" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "BRAK" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "WART" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "INT" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "£AÑCUCH" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLOAT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "PARAM" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Sk³adnia:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[OPCJA...]" - -#~ msgid "Options implemented via popt alias/exec:" -#~ msgstr "Opcje zaimplementowane poprzez popt alias/exec:" - -#~ msgid "Help options:" -#~ msgstr "Opcje pomocy:" diff --git a/po/popt.pot b/po/popt.pot index 670c404..8017da4 100644 --- a/po/popt.pot +++ b/po/popt.pot @@ -1,13 +1,13 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -19,99 +19,107 @@ msgstr "" msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\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" @@ -14,99 +14,107 @@ msgstr "" msgid "unknown errno" msgstr "errno desconhecido" -#: popt.c:964 +#: popt.c:996 #, 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:1184 +#: popt.c:1208 msgid "missing argument" msgstr "falta um argumento" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "opção desconhecida" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "foram pedidas operações lógicas mutuamente exclusivas" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "opt->arg não deve ser NULL" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "'aliases' demasiado aninhados" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "erros no 'quoting' de parâmetros" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "valor númerico inválido" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "número demasiado grando ou pequeno" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "alocação de memória falhou" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "erro desconhecido" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Mostrar esta mensagem de ajuda" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Mostrar uma mensagem de utilização sucinta" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "Mostrar valor por omissão das opções na mensagem" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "NONE" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "VAL" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "INT" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "STRING" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLOAT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Utilização:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[OPÇÃO...]" diff --git a/po/pt_BR.po b/po/pt_BR.po index df3d2ae..78ab7a1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,112 +6,120 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: ENCODING\n" #: popt.c:35 msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -14,101 +14,109 @@ msgstr "" msgid "unknown errno" msgstr "eroare necunoscuta" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "optiunea de tipul (%d) nu este implementata in popt\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "argument lipsa" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "optiune necunoscuta" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "recursivitate infinita la optiunile sinonime" -#: popt.c:1194 +#: popt.c:1218 #, fuzzy msgid "error in parameter quoting" msgstr "eroare la insertie parametru" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "valoare numarica invalida" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "numar prea mare sau prea mic" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "eroare necuinoscuta" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Afisare mesaj de help" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Afisare mesaj sintaxa sumar" -#: popthelp.c:79 +#: popthelp.c:83 #, fuzzy msgid "Display option defaults in message" msgstr "Afisare mesaj sintaxa sumar" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Sintaxa:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[OPTIUNE...]" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -14,99 +14,107 @@ msgstr "" msgid "unknown errno" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÎÏÍÅÒ ÏÛÉÂËÉ" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "ÏÂÒÁÂÏÔËÁ ÐÁÒÁÍÅÔÒÁ (%d) × popt ÎÅ ÐÒÅÄÕÓÍÏÔÒÅÎÁ\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "ÚÁÐÒÏÛÅÎÙ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÅ ÌÏÇÉÞÅÓËÉÅ ÏÐÅÒÁÃÉÉ" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "opt->arg ÎÅ ÍÏÖÅÔ ÂÙÔØ NULL" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "ÐÒÅ×ÙÛÅÎ ÕÒÏ×ÅÎØ ÄÏÐÕÓÔÉÍÏÊ ÒÅËÕÒÓÉÉ ÐÏÄÓÔÁÎÏ×ÏË" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "ÏÛÉÂËa ÐÏÍÅÝÅÎÉÑ ÐÁÒÁÍÅÔÒÏ× × ËÁ×ÙÞËÉ" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ ÚÁ ÐÒÅÄÅÌÁÍÉ ÐÒÅÄÕÓÍÏÔÒÅÎÎÏÇÏ" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "ÏÛÉÂËÁ ×ÙÄÅÌÅÎÉÑ ÐÁÍÑÔÉ" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "ðÏËÁÚÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "ðÏËÁÚÁÔØ ËÒÁÔËÕÀ ÉÎÓÔÒÕËÃÉÀ ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "ðÏËÁÚÁÔØ ÐÁÒÁÍÅÔÒÙ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "NONE" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "VAL" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "INT" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "STRING" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLOAT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[ðáòáíåôò...]" @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -18,100 +18,108 @@ msgstr "" msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Vypísa» túto správu" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Zobrazi» struèný návod na pou¾itie" -#: popthelp.c:79 +#: popthelp.c:83 #, fuzzy msgid "Display option defaults in message" msgstr "Zobrazi» struèný návod na pou¾itie" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -14,100 +14,108 @@ msgstr "" msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Prika¾i to sporoèilo s pomoèjo" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Prika¾i kratko sporoèilo o uporabi" -#: popthelp.c:79 +#: popthelp.c:83 #, fuzzy msgid "Display option defaults in message" msgstr "Prika¾i kratko sporoèilo o uporabi" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -6,112 +6,120 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: ENCODING\n" #: popt.c:35 msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -14,99 +14,107 @@ msgstr "" msgid "unknown errno" msgstr "okänt felnummer" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "flaggtypen (%d) är inte implementerad i popt\n" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "argument saknas" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "okänd flagga" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "ömsesidigt uteslutande logiska operationer begärdes" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "opt->arg får inte vara NULL" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "alias är nästlade för djupt" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "fel i parametercitering" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "ogiltigt numeriskt värde" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "talet för stort eller för litet" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "minnesallokering misslyckades" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "okänt fel" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Visa denna hjälptext" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Visa en kortfattad användningstext" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "Visa standardalternativ för flaggor i meddelande" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "INGET" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "VÄRDE" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "HELTAL" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LÅNG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "STRÄNG" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLYTTAL" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DUBBEL" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Användning:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[FLAGGA...]" @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -14,100 +14,108 @@ msgstr "" msgid "unknown errno" msgstr "bilinmeyen hata no" -#: popt.c:964 +#: popt.c:996 #, 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:1184 +#: popt.c:1208 msgid "missing argument" msgstr "argüman eksik" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "bilinmeyen seçenek" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "birbirini dýþlayan mantýksal iþlemler istendi" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "adlarda çok fazla içiçelikler" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "parametrelerde týrnak iþaretleme hatalý " -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "sayýsal deðer geçersiz" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "sayý ya çok büyük ya da çok küçük" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "bilinmeyen hata" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Bu yardým iletisini gösterir" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Kýsa bir kullaným iletisi göster" -#: popthelp.c:79 +#: popthelp.c:83 #, fuzzy msgid "Display option defaults in message" msgstr "Kýsa bir kullaným iletisi göster" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "YOK" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "DEÐ" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "INT" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "LONG" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "STRING" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "FLOAT" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "DOUBLE" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "ARG" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "Kullanýmý:" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "[SEÇENEK...]" @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -18,100 +18,108 @@ msgstr "" msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "ðÏËÁÚÁÔÉ ÃÀ ÄÏצÄËÕ" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "ðÏËÁÚÁÔÉ ËÏÒÏÔËÕ ÄÏצÄËÕ ÐÒÏ ×ÉËÏÒÉÓÔÁÎÎÑ" -#: popthelp.c:79 +#: popthelp.c:83 #, fuzzy msgid "Display option defaults in message" msgstr "ðÏËÁÚÁÔÉ ËÏÒÏÔËÕ ÄÏצÄËÕ ÐÒÏ ×ÉËÏÒÉÓÔÁÎÎÑ" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-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" @@ -22,100 +22,108 @@ msgstr "" msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "Mostrer ci messaedje d' aide chal" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "Mostre on court messaedje so kmint vos è siervi" -#: popthelp.c:79 +#: popthelp.c:83 #, fuzzy msgid "Display option defaults in message" msgstr "Mostre on court messaedje so kmint vos è siervi" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" @@ -6,112 +6,120 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-29 07:48-0500\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: ENCODING\n" #: popt.c:35 msgid "unknown errno" msgstr "" -#: popt.c:964 +#: popt.c:996 #, c-format msgid "option type (%d) not implemented in popt\n" msgstr "" -#: popt.c:1184 +#: popt.c:1208 msgid "missing argument" msgstr "" -#: popt.c:1186 +#: popt.c:1210 msgid "unknown option" msgstr "" -#: popt.c:1188 +#: popt.c:1212 msgid "mutually exclusive logical operations requested" msgstr "" -#: popt.c:1190 +#: popt.c:1214 msgid "opt->arg should not be NULL" msgstr "" -#: popt.c:1192 +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "" -#: popt.c:1194 +#: popt.c:1218 msgid "error in parameter quoting" msgstr "" -#: popt.c:1196 +#: popt.c:1220 msgid "invalid numeric value" msgstr "" -#: popt.c:1198 +#: popt.c:1222 msgid "number too large or too small" msgstr "" -#: popt.c:1200 +#: popt.c:1224 msgid "memory allocation failed" msgstr "" -#: popt.c:1204 +#: popt.c:1228 msgid "unknown error" msgstr "" -#: popthelp.c:64 popthelp.c:75 +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: popt.h:188 +msgid "Help options:" +msgstr "" + +#: popthelp.c:68 popthelp.c:79 msgid "Show this help message" msgstr "" -#: popthelp.c:65 popthelp.c:76 +#: popthelp.c:69 popthelp.c:80 msgid "Display brief usage message" msgstr "" -#: popthelp.c:79 +#: popthelp.c:83 msgid "Display option defaults in message" msgstr "" -#: popthelp.c:124 +#: popthelp.c:128 msgid "NONE" msgstr "" -#: popthelp.c:126 +#: popthelp.c:130 msgid "VAL" msgstr "" -#: popthelp.c:130 +#: popthelp.c:134 msgid "INT" msgstr "" -#: popthelp.c:131 +#: popthelp.c:135 msgid "LONG" msgstr "" -#: popthelp.c:132 +#: popthelp.c:136 msgid "STRING" msgstr "" -#: popthelp.c:133 +#: popthelp.c:137 msgid "FLOAT" msgstr "" -#: popthelp.c:134 +#: popthelp.c:138 msgid "DOUBLE" msgstr "" -#: popthelp.c:135 +#: popthelp.c:139 msgid "ARG" msgstr "" -#: popthelp.c:548 +#: popthelp.c:552 msgid "Usage:" msgstr "" -#: popthelp.c:572 +#: popthelp.c:576 msgid "[OPTION...]" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9128fa1..0930d01 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: translation\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-31 13:55+0100\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" "PO-Revision-Date: 2005-05-20 15:53+1000\n" "Last-Translator: \n" "Language-Team: <zh@li.org>\n" @@ -16,78 +16,111 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -msgid "ARG" -msgstr "ARG" - -msgid "DOUBLE" -msgstr "DOUBLE" - -msgid "Display brief usage message" -msgstr "显示简çŸçš„使用说明" - -msgid "Display option defaults in message" -msgstr "在信æ¯ä¸æ˜¾ç¤ºé»˜è®¤çš„选项" - -msgid "FLOAT" -msgstr "FLOAT" - -msgid "INT" -msgstr "INT" - -msgid "LONG" -msgstr "LONG" - -msgid "NONE" -msgstr "NONE" +#: popt.c:35 +msgid "unknown errno" +msgstr "未知的错误" -msgid "STRING" -msgstr "STRING" +#: popt.c:996 +#, c-format +msgid "option type (%d) not implemented in popt\n" +msgstr "选项类别 (%d) 沒有在 popt ä¸å®žçŽ°\n" -msgid "Show this help message" -msgstr "显示这个帮助信æ¯" +#: popt.c:1208 +msgid "missing argument" +msgstr "缺少å‚æ•°" -msgid "Usage:" -msgstr "用法:" +#: popt.c:1210 +msgid "unknown option" +msgstr "未知的选项" -msgid "VAL" -msgstr "VAL" +#: popt.c:1212 +msgid "mutually exclusive logical operations requested" +msgstr "éœ€è¦ XOR 逻辑è¿ç®—" -msgid "[OPTION...]" -msgstr "[选项...]" +#: popt.c:1214 +msgid "opt->arg should not be NULL" +msgstr "opt->arg ä¸åº”该为 NULL" +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "别å嵌套太深" +#: popt.c:1218 msgid "error in parameter quoting" msgstr "å‚数引å·é”™è¯¯" +#: popt.c:1220 msgid "invalid numeric value" msgstr "æ— æ•ˆçš„æ•°å€¼" +#: popt.c:1222 +msgid "number too large or too small" +msgstr "数值太大或太å°" + +#: popt.c:1224 msgid "memory allocation failed" msgstr "内å˜åˆ†é…错误" -msgid "missing argument" -msgstr "缺少å‚æ•°" +#: popt.c:1228 +msgid "unknown error" +msgstr "未知的错误" -msgid "mutually exclusive logical operations requested" -msgstr "éœ€è¦ XOR 逻辑è¿ç®—" +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" -msgid "number too large or too small" -msgstr "数值太大或太å°" +#: popt.h:188 +msgid "Help options:" +msgstr "" -msgid "opt->arg should not be NULL" -msgstr "opt->arg ä¸åº”该为 NULL" +#: popthelp.c:68 popthelp.c:79 +msgid "Show this help message" +msgstr "显示这个帮助信æ¯" -msgid "option type (%d) not implemented in popt\n" -msgstr "选项类别 (%d) 沒有在 popt ä¸å®žçŽ°\n" +#: popthelp.c:69 popthelp.c:80 +msgid "Display brief usage message" +msgstr "显示简çŸçš„使用说明" -msgid "unknown errno" -msgstr "未知的错误" +#: popthelp.c:83 +msgid "Display option defaults in message" +msgstr "在信æ¯ä¸æ˜¾ç¤ºé»˜è®¤çš„选项" -msgid "unknown error" -msgstr "未知的错误" +#: popthelp.c:128 +msgid "NONE" +msgstr "NONE" -msgid "unknown option" -msgstr "未知的选项" +#: popthelp.c:130 +msgid "VAL" +msgstr "VAL" +#: popthelp.c:134 +msgid "INT" +msgstr "INT" + +#: popthelp.c:135 +msgid "LONG" +msgstr "LONG" + +#: popthelp.c:136 +msgid "STRING" +msgstr "STRING" + +#: popthelp.c:137 +msgid "FLOAT" +msgstr "FLOAT" + +#: popthelp.c:138 +msgid "DOUBLE" +msgstr "DOUBLE" + +#: popthelp.c:139 +msgid "ARG" +msgstr "ARG" + +#: popthelp.c:552 +msgid "Usage:" +msgstr "用法:" + +#: popthelp.c:576 +msgid "[OPTION...]" +msgstr "[选项...]" diff --git a/po/zh_TW.po b/po/zh_TW.po index a9c2560..1074b3d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.10.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-31 13:55+0100\n" +"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n" +"POT-Creation-Date: 2007-01-21 14:25-0500\n" "PO-Revision-Date: 2005-04-08 17:52+0800\n" "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n" "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n" @@ -14,77 +14,111 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -msgid "ARG" -msgstr "ARG" - -msgid "DOUBLE" -msgstr "DOUBLE" - -msgid "Display brief usage message" -msgstr "顯示簡çŸçš„使用說明" - -msgid "Display option defaults in message" -msgstr "在訊æ¯ä¸é¡¯ç¤ºé è¨é¸é …" - -msgid "FLOAT" -msgstr "FLOAT" - -msgid "INT" -msgstr "INT" - -msgid "LONG" -msgstr "LONG" - -msgid "NONE" -msgstr "NONE" +#: popt.c:35 +msgid "unknown errno" +msgstr "未知的錯誤" -msgid "STRING" -msgstr "STRING" +#: popt.c:996 +#, c-format +msgid "option type (%d) not implemented in popt\n" +msgstr "é¸é …é¡žåž‹ (%d) 沒有在 popt ä¸å¯¦ä½œ\n" -msgid "Show this help message" -msgstr "顯示本說明訊æ¯" +#: popt.c:1208 +msgid "missing argument" +msgstr "缺少引數" -msgid "Usage:" -msgstr "用法:" +#: popt.c:1210 +msgid "unknown option" +msgstr "未知的é¸é …" -msgid "VAL" -msgstr "VAL" +#: popt.c:1212 +msgid "mutually exclusive logical operations requested" +msgstr "需è¦ç›¸äº’ç¨ç«‹çš„é‚輯é‹ç®—" -msgid "[OPTION...]" -msgstr "[é¸é …...]" +#: popt.c:1214 +msgid "opt->arg should not be NULL" +msgstr "opt->arg ä¸æ‡‰ç‚º NULL" +#: popt.c:1216 msgid "aliases nested too deeply" msgstr "巢狀別å太深" +#: popt.c:1218 msgid "error in parameter quoting" msgstr "åƒæ•¸å¼•è™ŸéŒ¯èª¤" +#: popt.c:1220 msgid "invalid numeric value" msgstr "ä¸æ£ç¢ºçš„數值" +#: popt.c:1222 +msgid "number too large or too small" +msgstr "數å—太大或太å°" + +#: popt.c:1224 msgid "memory allocation failed" msgstr "記憶體é…置錯誤" -msgid "missing argument" -msgstr "缺少引數" +#: popt.c:1228 +msgid "unknown error" +msgstr "未知的錯誤" -msgid "mutually exclusive logical operations requested" -msgstr "需è¦ç›¸äº’ç¨ç«‹çš„é‚輯é‹ç®—" +#: popt.h:172 +msgid "Options implemented via popt alias/exec:" +msgstr "" -msgid "number too large or too small" -msgstr "數å—太大或太å°" +#: popt.h:188 +msgid "Help options:" +msgstr "" -msgid "opt->arg should not be NULL" -msgstr "opt->arg ä¸æ‡‰ç‚º NULL" +#: popthelp.c:68 popthelp.c:79 +msgid "Show this help message" +msgstr "顯示本說明訊æ¯" -msgid "option type (%d) not implemented in popt\n" -msgstr "é¸é …é¡žåž‹ (%d) 沒有在 popt ä¸å¯¦ä½œ\n" +#: popthelp.c:69 popthelp.c:80 +msgid "Display brief usage message" +msgstr "顯示簡çŸçš„使用說明" -msgid "unknown errno" -msgstr "未知的錯誤" +#: popthelp.c:83 +msgid "Display option defaults in message" +msgstr "在訊æ¯ä¸é¡¯ç¤ºé è¨é¸é …" -msgid "unknown error" -msgstr "未知的錯誤" +#: popthelp.c:128 +msgid "NONE" +msgstr "NONE" -msgid "unknown option" -msgstr "未知的é¸é …" +#: popthelp.c:130 +msgid "VAL" +msgstr "VAL" + +#: popthelp.c:134 +msgid "INT" +msgstr "INT" + +#: popthelp.c:135 +msgid "LONG" +msgstr "LONG" + +#: popthelp.c:136 +msgid "STRING" +msgstr "STRING" + +#: popthelp.c:137 +msgid "FLOAT" +msgstr "FLOAT" + +#: popthelp.c:138 +msgid "DOUBLE" +msgstr "DOUBLE" + +#: popthelp.c:139 +msgid "ARG" +msgstr "ARG" + +#: popthelp.c:552 +msgid "Usage:" +msgstr "用法:" + +#: popthelp.c:576 +msgid "[OPTION...]" +msgstr "[é¸é …...]" @@ -56,9 +56,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 not NULL */ +/*@-nullstate@*/ /* LCL: con->execPath not NULL */ return; - /*@=nullstate@*/ +/*@=nullstate@*/ } static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt) @@ -144,10 +144,8 @@ static void invokeCallbacksOPTION(poptContext con, } else if (cbopt != NULL && ((myOpt->shortName && opt->shortName && shorty && myOpt->shortName == opt->shortName) || - (myOpt->longName && opt->longName && - /*@-nullpass@*/ /* LCL: opt->longName != NULL */ + (myOpt->longName != NULL && opt->longName != NULL && !strcmp(myOpt->longName, opt->longName))) - /*@=nullpass@*/ ) { /*@-castfcnptr@*/ poptCallbackType cb = (poptCallbackType)cbopt->arg; @@ -168,7 +166,7 @@ static void invokeCallbacksOPTION(poptContext con, } poptContext poptGetContext(const char * name, int argc, const char ** argv, - const struct poptOption * options, int flags) + const struct poptOption * options, unsigned int flags) { poptContext con = malloc(sizeof(*con)); @@ -177,18 +175,18 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv, con->os = con->optionStack; con->os->argc = argc; - /*@-dependenttrans -assignexpose@*/ /* FIX: W2DO? */ +/*@-dependenttrans -assignexpose@*/ /* FIX: W2DO? */ con->os->argv = argv; - /*@=dependenttrans =assignexpose@*/ +/*@=dependenttrans =assignexpose@*/ con->os->argb = NULL; if (!(flags & POPT_CONTEXT_KEEP_FIRST)) con->os->next = 1; /* skip argv[0] */ con->leftovers = calloc( (argc + 1), sizeof(*con->leftovers) ); - /*@-dependenttrans -assignexpose@*/ /* FIX: W2DO? */ +/*@-dependenttrans -assignexpose@*/ /* FIX: W2DO? */ con->options = options; - /*@=dependenttrans =assignexpose@*/ +/*@=dependenttrans =assignexpose@*/ con->aliases = NULL; con->numAliases = 0; con->flags = flags; @@ -207,9 +205,9 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv, if (t) con->appName = strcpy(t, name); } - /*@-internalglobs@*/ +/*@-internalglobs@*/ invokeCallbacksPRE(con, con->options); - /*@=internalglobs@*/ +/*@=internalglobs@*/ return con; } @@ -246,16 +244,16 @@ void poptResetContext(poptContext con) if (con->finalArgv != NULL) for (i = 0; i < con->finalArgvCount; i++) { - /*@-unqualifiedtrans@*/ /* FIX: typedef double indirection. */ +/*@-unqualifiedtrans@*/ /* FIX: typedef double indirection. */ con->finalArgv[i] = _free(con->finalArgv[i]); - /*@=unqualifiedtrans@*/ +/*@=unqualifiedtrans@*/ } con->finalArgvCount = 0; con->arg_strip = PBM_FREE(con->arg_strip); - /*@-nullstate@*/ /* FIX: con->finalArgv != NULL */ +/*@-nullstate@*/ /* FIX: con->finalArgv != NULL */ return; - /*@=nullstate@*/ +/*@=nullstate@*/ } /*@=boundswrite@*/ @@ -314,9 +312,7 @@ static int handleExec(/*@special@*/ poptContext con, con->finalArgv[i] = NULL; } - /*@-nullstate@*/ /* FIX: con->finalArgv[] == NULL */ return 1; - /*@=nullstate@*/ } /*@=boundswrite@*/ @@ -422,7 +418,7 @@ static int execCommand(poptContext con) argv[argc] = NULL; -#ifdef __hpux +#if defined(hpux) || defined(__hpux) rc = setresgid(getgid(), getgid(),-1); if (rc) return POPT_ERROR_ERRNO; rc = setresuid(getuid(), getuid(),-1); @@ -500,17 +496,15 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, /* Sub-table data will be inheirited if no data yet. */ if (!(callback && *callback)) return opt2; if (!(callbackData && *callbackData == NULL)) return opt2; - /*@-observertrans -dependenttrans @*/ +/*@-observertrans -dependenttrans @*/ *callbackData = opt->descrip; - /*@=observertrans =dependenttrans @*/ +/*@=observertrans =dependenttrans @*/ return opt2; } else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) { cb = opt; - } else if (longName && opt->longName && + } else if (longName != NULL && opt->longName != NULL && (!singleDash || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) && - /*@-nullpass@*/ /* LCL: opt->longName != NULL */ !strcmp(longName, opt->longName)) - /*@=nullpass@*/ { break; } else if (shortName && shortName == opt->shortName) { @@ -518,9 +512,10 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, } } - if (!opt->longName && !opt->shortName) + if (opt->longName == NULL && !opt->shortName) return NULL; - /*@-modobserver -mods @*/ + +/*@-modobserver -mods @*/ if (callback) *callback = NULL; if (callbackData) *callbackData = NULL; if (cb) { @@ -530,12 +525,12 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, /*@=castfcnptr@*/ if (!(cb->argInfo & POPT_CBFLAG_INC_DATA)) { if (callbackData) - /*@-observertrans@*/ /* FIX: typedef double indirection. */ +/*@-observertrans@*/ /* FIX: typedef double indirection. */ *callbackData = cb->descrip; - /*@=observertrans@*/ +/*@=observertrans@*/ } } - /*@=modobserver =mods @*/ +/*@=modobserver =mods @*/ return opt; } @@ -557,7 +552,7 @@ static const char * findNextArg(/*@special@*/ poptContext con, if (os->next == os->argc && os == con->optionStack) break; if (os->argv != NULL) for (i = os->next; i < os->argc; i++) { - /*@-sizeoftype@*/ +/*@-sizeoftype@*/ if (os->argb && PBM_ISSET(i, os->argb)) /*@innercontinue@*/ continue; if (*os->argv[i] == '-') @@ -571,7 +566,7 @@ static const char * findNextArg(/*@special@*/ poptContext con, PBM_SET(i, os->argb); } /*@innerbreak@*/ break; - /*@=sizeoftype@*/ +/*@=sizeoftype@*/ } if (os > con->optionStack) os--; } while (arg == NULL); @@ -605,7 +600,7 @@ expandNextArg(/*@special@*/ poptContext con, const char * s) /*@switchbreak@*/ break; /* XXX Make sure that findNextArg deletes only next arg. */ if (a == NULL) { - if ((a = findNextArg(con, 1, 1)) == NULL) + if ((a = findNextArg(con, 1U, 1)) == NULL) /*@switchbreak@*/ break; } s += 3; @@ -634,23 +629,35 @@ static void poptStripArg(/*@special@*/ poptContext con, int which) /*@defines con->arg_strip @*/ /*@modifies con @*/ { - /*@-sizeoftype@*/ +/*@-sizeoftype@*/ if (con->arg_strip == NULL) con->arg_strip = PBM_ALLOC(con->optionStack[0].argc); if (con->arg_strip != NULL) /* XXX can't happen */ PBM_SET(which, con->arg_strip); - /*@=sizeoftype@*/ - /*@-compdef@*/ /* LCL: con->arg_strip udefined? */ +/*@=sizeoftype@*/ +/*@-compdef@*/ /* LCL: con->arg_strip undefined? */ return; - /*@=compdef@*/ +/*@=compdef@*/ } -int poptSaveLong(long * arg, int argInfo, long aLong) +/*@unchecked@*/ +static unsigned int seed = 0; + +/*@-bitwisesigned@*/ /* LCL: logical ops with unsigned. */ +int poptSaveLong(long * arg, unsigned int argInfo, long aLong) { /* XXX Check alignment, may fail on funky platforms. */ if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1))) return POPT_ERROR_NULLARG; + if (aLong != 0 && argInfo & POPT_ARGFLAG_RANDOM) { + if (!seed) { + srandom((unsigned)getpid()); + srandom((unsigned)random()); + } + aLong = random() % (aLong > 0 ? aLong : -aLong); + aLong++; + } if (argInfo & POPT_ARGFLAG_NOT) aLong = ~aLong; switch (argInfo & POPT_ARGFLAG_LOGICALOPS) { @@ -672,13 +679,23 @@ int poptSaveLong(long * arg, int argInfo, long aLong) } return 0; } +/*@=bitwisesigned@*/ -int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong) +/*@-bitwisesigned@*/ /* LCL: logical ops with unsigned. */ +int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong) { /* XXX Check alignment, may fail on funky platforms. */ if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1))) return POPT_ERROR_NULLARG; + if (aLong != 0 && argInfo & POPT_ARGFLAG_RANDOM) { + if (!seed) { + srandom((unsigned)getpid()); + srandom((unsigned)random()); + } + aLong = random() % (aLong > 0 ? aLong : -aLong); + aLong++; + } if (argInfo & POPT_ARGFLAG_NOT) aLong = ~aLong; switch (argInfo & POPT_ARGFLAG_LOGICALOPS) { @@ -700,6 +717,7 @@ int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong) } return 0; } +/*@=bitwisesigned@*/ /*@-boundswrite@*/ /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */ @@ -723,9 +741,15 @@ int poptGetNextOpt(poptContext con) cleanOSE(con->os--); } if (!con->os->nextCharArg && con->os->next == con->os->argc) { - /*@-internalglobs@*/ invokeCallbacksPOST(con, con->options); - /*@=internalglobs@*/ + + if (con->maincall) { + /*@-noeffectuncon @*/ + (void) (*con->maincall) (con->finalArgvCount, con->finalArgv); + /*@=noeffectuncon @*/ + return -1; + } + if (con->doExec) return execCommand(con); return -1; } @@ -735,12 +759,12 @@ int poptGetNextOpt(poptContext con) char * localOptString, * optString; int thisopt; - /*@-sizeoftype@*/ +/*@-sizeoftype@*/ if (con->os->argb && PBM_ISSET(con->os->next, con->os->argb)) { con->os->next++; continue; } - /*@=sizeoftype@*/ +/*@=sizeoftype@*/ thisopt = con->os->next; if (con->os->argv != NULL) /* XXX can't happen */ origOptString = con->os->argv[con->os->next++]; @@ -748,7 +772,9 @@ int poptGetNextOpt(poptContext con) if (origOptString == NULL) /* XXX can't happen */ return POPT_ERROR_BADOPT; - if (con->restLeftover || *origOptString != '-') { + if (con->restLeftover || *origOptString != '-' || + (*origOptString == '-' && origOptString[1] == '\0')) + { if (con->flags & POPT_CONTEXT_POSIXMEHARDER) con->restLeftover = 1; if (con->flags & POPT_CONTEXT_ARG_OPTS) { @@ -816,7 +842,7 @@ int poptGetNextOpt(poptContext con) } /* Process next short option */ - /*@-branchstate@*/ /* FIX: W2DO? */ +/*@-branchstate@*/ /* FIX: W2DO? */ if (con->os->nextCharArg) { origOptString = con->os->nextCharArg; @@ -843,7 +869,7 @@ int poptGetNextOpt(poptContext con) 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) { @@ -856,9 +882,7 @@ int poptGetNextOpt(poptContext con) } } else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) { con->os->nextArg = _free(con->os->nextArg); - /*@-usedef@*/ /* FIX: W2DO? */ if (longArg) { - /*@=usedef@*/ longArg = expandNextArg(con, longArg); con->os->nextArg = longArg; } else if (con->os->nextCharArg) { @@ -872,9 +896,7 @@ int poptGetNextOpt(poptContext con) } if (con->os->next == con->os->argc) { if (!(opt->argInfo & POPT_ARGFLAG_OPTIONAL)) - /*@-compdef@*/ /* FIX: con->os->argv not defined */ return POPT_ERROR_NOARG; - /*@=compdef@*/ con->os->nextArg = NULL; } else { @@ -889,10 +911,15 @@ int poptGetNextOpt(poptContext con) } if (con->os->argv != NULL) { /* XXX can't happen */ - /* XXX watchout: subtle side-effects live here. */ - longArg = con->os->argv[con->os->next++]; - longArg = expandNextArg(con, longArg); - con->os->nextArg = longArg; + if (opt->argInfo & POPT_ARGFLAG_OPTIONAL && + con->os->argv[con->os->next][0] == '-') { + con->os->nextArg = NULL; + } else { + /* XXX watchout: subtle side-effects live here. */ + longArg = con->os->argv[con->os->next++]; + longArg = expandNextArg(con, longArg); + con->os->nextArg = longArg; + } } } } @@ -936,14 +963,14 @@ int poptGetNextOpt(poptContext con) char *end; if (con->os->nextArg) { - /*@-mods@*/ +/*@-mods@*/ int saveerrno = errno; errno = 0; aDouble = strtod(con->os->nextArg, &end); if (errno == ERANGE) return POPT_ERROR_OVERFLOW; errno = saveerrno; - /*@=mods@*/ +/*@=mods@*/ if (*end != '\0') return POPT_ERROR_BADNUMBER; } @@ -959,6 +986,11 @@ int poptGetNextOpt(poptContext con) *((float *) opt->arg) = aDouble; } } /*@switchbreak@*/ break; + case POPT_ARG_MAINCALL: +/*@-type@*/ + con->maincall = opt->arg; +/*@=type@*/ + /*@switchbreak@*/ break; default: fprintf(stdout, POPT_("option type (%d) not implemented in popt\n"), @@ -969,11 +1001,9 @@ int poptGetNextOpt(poptContext con) } } - if (cb) { - /*@-internalglobs@*/ + if (cb) invokeCallbacksOPTION(con, con->options, opt, cbData, shorty); - /*@=internalglobs@*/ - } else if (opt->val && ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL)) + else if (opt->val && ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL)) done = 1; if ((con->finalArgvCount + 2) >= (con->finalArgvAlloced)) { @@ -1001,11 +1031,9 @@ int poptGetNextOpt(poptContext con) else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) /*@-ifempty@*/ ; /*@=ifempty@*/ else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) { - if (con->finalArgv != NULL && con->os->nextArg) + if (con->finalArgv != NULL && con->os->nextArg != NULL) con->finalArgv[con->finalArgvCount++] = - /*@-nullpass@*/ /* LCL: con->os->nextArg != NULL */ xstrdup(con->os->nextArg); - /*@=nullpass@*/ } } @@ -1016,12 +1044,12 @@ int poptGetNextOpt(poptContext con) const char * poptGetOptArg(poptContext con) { const char * ret = NULL; - /*@-branchstate@*/ +/*@-branchstate@*/ if (con) { ret = con->os->nextArg; con->os->nextArg = NULL; } - /*@=branchstate@*/ +/*@=branchstate@*/ return ret; } @@ -1051,9 +1079,9 @@ const char ** poptGetArgs(poptContext con) /* some apps like [like RPM ;-) ] need this NULL terminated */ con->leftovers[con->numLeftovers] = NULL; - /*@-nullret -nullstate @*/ /* FIX: typedef double indirection. */ +/*@-nullret -nullstate @*/ /* FIX: typedef double indirection. */ return (con->leftovers + con->nextLeftover); - /*@=nullret =nullstate @*/ +/*@=nullret =nullstate @*/ } /*@=boundswrite@*/ @@ -1069,11 +1097,11 @@ poptContext poptFreeContext(poptContext con) if (con->aliases != NULL) for (i = 0; i < con->numAliases; i++) { item = con->aliases + i; - /*@-modobserver -observertrans -dependenttrans@*/ +/*@-modobserver -observertrans -dependenttrans@*/ item->option.longName = _free(item->option.longName); item->option.descrip = _free(item->option.descrip); item->option.argDescrip = _free(item->option.argDescrip); - /*@=modobserver =observertrans =dependenttrans@*/ +/*@=modobserver =observertrans =dependenttrans@*/ item->argv = _free(item->argv); } con->aliases = _free(con->aliases); @@ -1081,11 +1109,11 @@ poptContext poptFreeContext(poptContext con) if (con->execs != NULL) for (i = 0; i < con->numExecs; i++) { item = con->execs + i; - /*@-modobserver -observertrans -dependenttrans@*/ +/*@-modobserver -observertrans -dependenttrans@*/ item->option.longName = _free(item->option.longName); item->option.descrip = _free(item->option.descrip); item->option.argDescrip = _free(item->option.argDescrip); - /*@=modobserver =observertrans =dependenttrans@*/ +/*@=modobserver =observertrans =dependenttrans@*/ item->argv = _free(item->argv); } con->execs = _free(con->execs); @@ -1119,7 +1147,6 @@ int poptAddAlias(poptContext con, struct poptAlias alias, } /*@-boundswrite@*/ -/*@-mustmod@*/ /* LCL: con not modified? */ int poptAddItem(poptContext con, poptItem newItem, int flags) { poptItem * items, item; @@ -1162,22 +1189,19 @@ int poptAddItem(poptContext con, poptItem newItem, int flags) return 0; } -/*@=mustmod@*/ /*@=boundswrite@*/ -const char * poptBadOption(poptContext con, int flags) +const char * poptBadOption(poptContext con, unsigned int flags) { struct optionStackEntry * os = NULL; if (con != NULL) os = (flags & POPT_BADOPTION_NOALIAS) ? con->optionStack : con->os; - /*@-nullderef@*/ /* LCL: os->argv != NULL */ - return (os && os->argv ? os->argv[os->next - 1] : NULL); - /*@=nullderef@*/ + return (os != NULL && os->argv != NULL ? os->argv[os->next - 1] : NULL); } -const char *const poptStrerror(const int error) +const char * poptStrerror(const int error) { switch (error) { case POPT_ERROR_NOARG: @@ -1240,7 +1264,7 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv) int j = 1; int i; - /*@-sizeoftype@*/ +/*@-sizeoftype@*/ if (con->arg_strip) for (i = 1; i < argc; i++) { if (PBM_ISSET(i, con->arg_strip)) @@ -1253,7 +1277,7 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv) argv[j] = (j < numargs) ? argv[i] : NULL; j++; } - /*@=sizeoftype@*/ +/*@=sizeoftype@*/ return numargs; } @@ -17,41 +17,43 @@ * \name Arg type identifiers */ /*@{*/ -#define POPT_ARG_NONE 0 /*!< no arg */ -#define POPT_ARG_STRING 1 /*!< arg will be saved as string */ -#define POPT_ARG_INT 2 /*!< arg will be converted to int */ -#define POPT_ARG_LONG 3 /*!< arg will be converted to long */ -#define POPT_ARG_INCLUDE_TABLE 4 /*!< arg points to table */ -#define POPT_ARG_CALLBACK 5 /*!< table-wide callback... must be +#define POPT_ARG_NONE 0U /*!< no arg */ +#define POPT_ARG_STRING 1U /*!< arg will be saved as string */ +#define POPT_ARG_INT 2U /*!< arg will be converted to int */ +#define POPT_ARG_LONG 3U /*!< arg will be converted to long */ +#define POPT_ARG_INCLUDE_TABLE 4U /*!< arg points to table */ +#define POPT_ARG_CALLBACK 5U /*!< table-wide callback... must be set first in table; arg points to callback, descrip points to callback data to pass */ -#define POPT_ARG_INTL_DOMAIN 6 /*!< set the translation domain +#define POPT_ARG_INTL_DOMAIN 6U /*!< set the translation domain for this table and any included tables; arg points to the domain string */ -#define POPT_ARG_VAL 7 /*!< arg should take value val */ -#define POPT_ARG_FLOAT 8 /*!< arg will be converted to float */ -#define POPT_ARG_DOUBLE 9 /*!< arg will be converted to double */ +#define POPT_ARG_VAL 7U /*!< arg should take value val */ +#define POPT_ARG_FLOAT 8U /*!< arg will be converted to float */ +#define POPT_ARG_DOUBLE 9U /*!< arg will be converted to double */ -#define POPT_ARG_MASK 0x0000FFFF +#define POPT_ARG_MAINCALL 10U /*!< return (*arg) (argc, argv) */ + +#define POPT_ARG_MASK 0x0000FFFFU /*@}*/ /** \ingroup popt * \name Arg modifiers */ /*@{*/ -#define POPT_ARGFLAG_ONEDASH 0x80000000 /*!< allow -longoption */ -#define POPT_ARGFLAG_DOC_HIDDEN 0x40000000 /*!< don't show in help/usage */ -#define POPT_ARGFLAG_STRIP 0x20000000 /*!< strip this arg from argv(only applies to long args) */ -#define POPT_ARGFLAG_OPTIONAL 0x10000000 /*!< arg may be missing */ - -#define POPT_ARGFLAG_OR 0x08000000 /*!< arg will be or'ed */ -#define POPT_ARGFLAG_NOR 0x09000000 /*!< arg will be nor'ed */ -#define POPT_ARGFLAG_AND 0x04000000 /*!< arg will be and'ed */ -#define POPT_ARGFLAG_NAND 0x05000000 /*!< arg will be nand'ed */ -#define POPT_ARGFLAG_XOR 0x02000000 /*!< arg will be xor'ed */ -#define POPT_ARGFLAG_NOT 0x01000000 /*!< arg will be negated */ +#define POPT_ARGFLAG_ONEDASH 0x80000000U /*!< allow -longoption */ +#define POPT_ARGFLAG_DOC_HIDDEN 0x40000000U /*!< don't show in help/usage */ +#define POPT_ARGFLAG_STRIP 0x20000000U /*!< strip this arg from argv(only applies to long args) */ +#define POPT_ARGFLAG_OPTIONAL 0x10000000U /*!< arg may be missing */ + +#define POPT_ARGFLAG_OR 0x08000000U /*!< arg will be or'ed */ +#define POPT_ARGFLAG_NOR 0x09000000U /*!< arg will be nor'ed */ +#define POPT_ARGFLAG_AND 0x04000000U /*!< arg will be and'ed */ +#define POPT_ARGFLAG_NAND 0x05000000U /*!< arg will be nand'ed */ +#define POPT_ARGFLAG_XOR 0x02000000U /*!< arg will be xor'ed */ +#define POPT_ARGFLAG_NOT 0x01000000U /*!< arg will be negated */ #define POPT_ARGFLAG_LOGICALOPS \ (POPT_ARGFLAG_OR|POPT_ARGFLAG_AND|POPT_ARGFLAG_XOR) @@ -60,7 +62,8 @@ #define POPT_BIT_CLR (POPT_ARG_VAL|POPT_ARGFLAG_NAND) /*!< clear arg bit(s) */ -#define POPT_ARGFLAG_SHOW_DEFAULT 0x00800000 /*!< show default value in --help */ +#define POPT_ARGFLAG_SHOW_DEFAULT 0x00800000U /*!< show default value in --help */ +#define POPT_ARGFLAG_RANDOM 0x00400000U /*<! random value in [1,arg] */ /*@}*/ @@ -68,12 +71,12 @@ * \name Callback modifiers */ /*@{*/ -#define POPT_CBFLAG_PRE 0x80000000 /*!< call the callback before parse */ -#define POPT_CBFLAG_POST 0x40000000 /*!< call the callback after parse */ -#define POPT_CBFLAG_INC_DATA 0x20000000 /*!< use data from the include line, +#define POPT_CBFLAG_PRE 0x80000000U /*!< call the callback before parse */ +#define POPT_CBFLAG_POST 0x40000000U /*!< call the callback after parse */ +#define POPT_CBFLAG_INC_DATA 0x20000000U /*!< use data from the include line, not the subtable */ -#define POPT_CBFLAG_SKIPOPTION 0x10000000 /*!< don't callback with option */ -#define POPT_CBFLAG_CONTINUE 0x08000000 /*!< continue callbacks with option */ +#define POPT_CBFLAG_SKIPOPTION 0x10000000U /*!< don't callback with option */ +#define POPT_CBFLAG_CONTINUE 0x08000000U /*!< continue callbacks with option */ /*@}*/ /** \ingroup popt @@ -96,17 +99,17 @@ * \name poptBadOption() flags */ /*@{*/ -#define POPT_BADOPTION_NOALIAS (1 << 0) /*!< don't go into an alias */ +#define POPT_BADOPTION_NOALIAS (1U << 0) /*!< don't go into an alias */ /*@}*/ /** \ingroup popt * \name poptGetContext() flags */ /*@{*/ -#define POPT_CONTEXT_NO_EXEC (1 << 0) /*!< ignore exec expansions */ -#define POPT_CONTEXT_KEEP_FIRST (1 << 1) /*!< pay attention to argv[0] */ -#define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /*!< options can't follow args */ -#define POPT_CONTEXT_ARG_OPTS (1 << 4) /*!< return args as options with value 0 */ +#define POPT_CONTEXT_NO_EXEC (1U << 0) /*!< ignore exec expansions */ +#define POPT_CONTEXT_KEEP_FIRST (1U << 1) /*!< pay attention to argv[0] */ +#define POPT_CONTEXT_POSIXMEHARDER (1U << 2) /*!< options can't follow args */ +#define POPT_CONTEXT_ARG_OPTS (1U << 4) /*!< return args as options with value 0 */ /*@}*/ /** \ingroup popt @@ -115,7 +118,7 @@ struct poptOption { /*@observer@*/ /*@null@*/ const char * longName; /*!< may be NULL */ char shortName; /*!< may be NUL */ - int argInfo; + unsigned int argInfo; /*@shared@*/ /*@null@*/ void * arg; /*!< depends on argInfo */ int val; /*!< 0 means don't return, just update flag */ @@ -154,6 +157,10 @@ typedef struct poptItem_s { */ /*@{*/ +#if !defined(N_) +#define N_(foo) foo +#endif + /** * Empty table marker to enable displaying popt alias/exec options. */ @@ -162,7 +169,7 @@ typedef struct poptItem_s { extern struct poptOption poptAliasOptions[]; /*@=exportvar@*/ #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \ - 0, "Options implemented via popt alias/exec:", NULL }, + 0, N_("Options implemented via popt alias/exec:"), NULL }, /** * Auto help table options. @@ -178,9 +185,9 @@ extern struct poptOption * poptHelpOptionsI18N; /*@=exportvar@*/ #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \ - 0, "Help options:", NULL }, + 0, N_("Help options:"), NULL }, -#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL } +#define POPT_TABLEEND { NULL, '\0', 0, NULL, 0, NULL, NULL } /*@}*/ /** \ingroup popt @@ -197,6 +204,8 @@ typedef struct poptOption * poptOption; /*@=exporttype =typeuse@*/ #endif +/** \ingroup popt + */ /*@-exportconst@*/ enum poptCallbackReason { POPT_CALLBACK_REASON_PRE = 0, @@ -240,7 +249,7 @@ poptContext poptGetContext( /*@dependent@*/ /*@keep@*/ const char * name, int argc, /*@dependent@*/ /*@keep@*/ const char ** argv, /*@dependent@*/ /*@keep@*/ const struct poptOption * options, - int flags) + unsigned int flags) /*@*/; /** \ingroup popt @@ -303,7 +312,7 @@ const char ** poptGetArgs(/*@null@*/poptContext con) * @return offending option */ /*@observer@*/ -const char * poptBadOption(/*@null@*/poptContext con, int flags) +const char * poptBadOption(/*@null@*/poptContext con, unsigned int flags) /*@*/; /** \ingroup popt @@ -460,7 +469,7 @@ int poptConfigFileToString(FILE *fp, /*@out@*/ char ** argstrp, int flags) * @return error string */ /*@observer@*/ -const char *const poptStrerror(const int error) +const char * poptStrerror(const int error) /*@*/; /** \ingroup popt @@ -536,8 +545,9 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv) */ /*@-incondefs@*/ /*@unused@*/ -int poptSaveLong(/*@null@*/ long * arg, int argInfo, long aLong) - /*@modifies *arg @*/ +int poptSaveLong(/*@null@*/ long * arg, unsigned int argInfo, long aLong) + /*@globals internalState @*/ + /*@modifies *arg, internalState @*/ /*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/; /*@=incondefs@*/ @@ -551,8 +561,9 @@ int poptSaveLong(/*@null@*/ long * arg, int argInfo, long aLong) */ /*@-incondefs@*/ /*@unused@*/ -int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong) - /*@modifies *arg @*/ +int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong) + /*@globals internalState @*/ + /*@modifies *arg, internalState @*/ /*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/; /*@=incondefs@*/ @@ -4,7 +4,7 @@ # Summary: A C library for parsing command line parameters. Name: popt -Version: 1.10.2 +Version: 1.10.7 Release: 0.1 License: X Consortium Group: System Environment/Libraries diff --git a/poptconfig.c b/poptconfig.c index e5cba45..0112f86 100644 --- a/poptconfig.c +++ b/poptconfig.c @@ -46,16 +46,16 @@ static void configLine(poptContext con, char * line) while (*line != '\0' && isspace(*line)) line++; if (*line == '\0') return; - /*@-temptrans@*/ /* FIX: line alias is saved */ +/*@-temptrans@*/ /* FIX: line alias is saved */ if (opt[0] == '-' && opt[1] == '-') item->option.longName = opt + 2; else if (opt[0] == '-' && opt[2] == '\0') item->option.shortName = opt[1]; - /*@=temptrans@*/ +/*@=temptrans@*/ if (poptParseArgvString(line, &item->argc, &item->argv)) return; - /*@-modobserver@*/ +/*@-modobserver@*/ item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN; for (i = 0, j = 0; i < item->argc; i++, j++) { const char * f; @@ -81,15 +81,15 @@ static void configLine(poptContext con, char * line) item->argv[j] = NULL; item->argc = j; } - /*@=modobserver@*/ +/*@=modobserver@*/ /*@=boundswrite@*/ - /*@-nullstate@*/ /* FIX: item->argv[] may be NULL */ +/*@-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@*/ +/*@=nullstate@*/ } /*@=compmempass@*/ @@ -128,7 +128,7 @@ int poptReadConfigFile(poptContext con, const char * fn) chptr = file; end = (file + fileLength); - /*@-infloops@*/ /* LCL: can't detect chptr++ */ +/*@-infloops@*/ /* LCL: can't detect chptr++ */ while (chptr < end) { switch (*chptr) { case '\n': @@ -154,7 +154,7 @@ int poptReadConfigFile(poptContext con, const char * fn) /*@switchbreak@*/ break; } } - /*@=infloops@*/ +/*@=infloops@*/ /*@=boundswrite@*/ return 0; @@ -19,6 +19,8 @@ /*@access poptContext@*/ +#define _POPTHELP_MAXLINE ((size_t)79) + /** * Display arguments. * @param con context @@ -27,17 +29,19 @@ * @param arg (unused) * @param data (unused) */ +/*@exits@*/ static void displayArgs(poptContext con, /*@unused@*/ enum poptCallbackReason foo, struct poptOption * key, /*@unused@*/ const char * arg, /*@unused@*/ void * data) /*@globals fileSystem@*/ - /*@modifies fileSystem@*/ + /*@modifies con, fileSystem@*/ { if (key->shortName == '?') poptPrintHelp(con, stdout, 0); else poptPrintUsage(con, stdout, 0); +/*@i@*/ con = poptFreeContext(con); /* XXX keep valgrind happy */ exit(0); } @@ -60,9 +64,9 @@ struct poptOption poptAliasOptions[] = { /*@-castfcnptr@*/ /*@observer@*/ /*@unchecked@*/ struct poptOption poptHelpOptions[] = { - { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL }, - { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL }, - { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL }, + { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, 0, NULL, NULL }, + { "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL }, + { "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"), NULL }, POPT_TABLEEND } ; @@ -71,9 +75,9 @@ static struct poptOption poptHelpOptions2[] = { /*@-readonlytrans@*/ { NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL}, /*@=readonlytrans@*/ - { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL }, - { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL }, - { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL }, + { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, 0, NULL, NULL }, + { "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL }, + { "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"), NULL }, #ifdef NOTYET { "defaults", '\0', POPT_ARG_NONE, &show_option_defaults, 0, N_("Display option defaults in message"), NULL }, @@ -88,7 +92,7 @@ struct poptOption * poptHelpOptionsI18N = poptHelpOptions2; /** * @param table option(s) */ -/*@observer@*/ /*@null@*/ static const char *const +/*@observer@*/ /*@null@*/ static const char * getTableTranslationDomain(/*@null@*/ const struct poptOption *table) /*@*/ { @@ -106,7 +110,7 @@ getTableTranslationDomain(/*@null@*/ const struct poptOption *table) * @param opt option(s) * @param translation_domain translation domain */ -/*@observer@*/ /*@null@*/ static const char *const +/*@observer@*/ /*@null@*/ static const char * getArgDescrip(const struct poptOption * opt, /*@-paramuse@*/ /* FIX: i18n macros disabled with lclint */ /*@null@*/ const char * translation_domain) @@ -222,7 +226,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol, /*@modifies *fp, fileSystem @*/ { size_t indentLength = maxLeftCol + 5; - size_t lineLength = 79 - indentLength; + size_t lineLength = _POPTHELP_MAXLINE - indentLength; const char * help = D_(translation_domain, opt->descrip); const char * argDescrip = getArgDescrip(opt, translation_domain); size_t helpLength; @@ -260,7 +264,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol, *le++ = '['; /* Choose type of output */ - /*@-branchstate@*/ +/*@-branchstate@*/ if (opt->argInfo & POPT_ARGFLAG_SHOW_DEFAULT) { defs = singleOptionDefaultValue(lineLength, opt, translation_domain); if (defs) { @@ -279,7 +283,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol, defs = t; } } - /*@=branchstate@*/ +/*@=branchstate@*/ if (opt->argDescrip == NULL) { switch (opt->argInfo & POPT_ARG_MASK) { @@ -341,7 +345,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol, mbstate_t t; size_t n; - memset ((void *)&t, '\0', sizeof (t)); /* In initial state. */ + memset ((void *)&t, 0, sizeof (t)); /* In initial state. */ /* Determine number of characters. */ n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t); @@ -356,7 +360,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol, /*@=boundswrite@*/ if (help) - fprintf(fp," %-*s ", maxLeftCol+displaypad, left); + fprintf(fp," %-*s ", (int)(maxLeftCol+displaypad), left); else { fprintf(fp," %s\n", left); goto out; @@ -366,9 +370,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol, /*@-branchstate@*/ if (defs) { help = defs; - defs = NULL; } -/*@=branchstate@*/ helpLength = strlen(help); /*@-boundsread@*/ @@ -391,8 +393,10 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol, helpLength = strlen(help); } /*@=boundsread@*/ +/*@=branchstate@*/ if (helpLength) fprintf(fp, "%s\n", help); + help = NULL; out: /*@-dependenttrans@*/ @@ -441,7 +445,7 @@ static size_t maxArgWidth(const struct poptOption * opt, size_t n; /*@-boundswrite@*/ - memset ((void *)&t, '\0', sizeof (t)); /* In initial state. */ + memset ((void *)&t, 0, sizeof (t)); /* In initial state. */ /*@=boundswrite@*/ /* Determine number of characters. */ n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t); @@ -528,7 +532,7 @@ static void singleTableHelp(poptContext con, FILE * fp, sub_transdom = translation_domain; if (opt->descrip) - fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip)); + POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip)); singleTableHelp(con, fp, opt->arg, left, sub_transdom); } @@ -538,19 +542,19 @@ static void singleTableHelp(poptContext con, FILE * fp, * @param con context * @param fp output file handle */ -static int showHelpIntro(poptContext con, FILE * fp) +static size_t showHelpIntro(poptContext con, FILE * fp) /*@globals fileSystem @*/ /*@modifies *fp, fileSystem @*/ { - int len = 6; + size_t len = (size_t)6; const char * fn; fprintf(fp, POPT_("Usage:")); if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) { /*@-boundsread@*/ - /*@-nullderef -type@*/ /* LCL: wazzup? */ +/*@-type@*/ /* LCL: wazzup? */ fn = con->optionStack->argv[0]; - /*@=nullderef =type@*/ +/*@=type@*/ /*@=boundsread@*/ if (fn == NULL) return len; if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1; @@ -588,26 +592,30 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor, /*@globals fileSystem @*/ /*@modifies *fp, fileSystem @*/ { - size_t len = 4; + size_t len = (size_t)4; char shortStr[2] = { '\0', '\0' }; const char * item = shortStr; const char * argDescrip = getArgDescrip(opt, translation_domain); + int bingo = 0; if (opt->shortName != '\0' && opt->longName != NULL) { len += 2; if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++; len += strlen(opt->longName); + bingo++; } else if (opt->shortName != '\0') { len++; shortStr[0] = opt->shortName; shortStr[1] = '\0'; + bingo++; } else if (opt->longName) { len += strlen(opt->longName); if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++; item = opt->longName; + bingo++; } - if (len == 4) return cursor; + if (!bingo) return cursor; #ifdef POPT_WCHAR_HACK /* XXX Calculate no. of display characters. */ @@ -617,7 +625,7 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor, size_t n; /*@-boundswrite@*/ - memset ((void *)&t, '\0', sizeof (t)); /* In initial state. */ + memset ((void *)&t, 0, sizeof (t)); /* In initial state. */ /*@=boundswrite@*/ /* Determine number of characters. */ n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t); @@ -628,9 +636,9 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor, len += sizeof("=")-1 + strlen(argDescrip); #endif - if ((cursor + len) > 79) { + if ((cursor + len) > _POPTHELP_MAXLINE) { fprintf(fp, "\n "); - cursor = 7; + cursor = (size_t)7; } if (opt->longName && opt->shortName) { @@ -666,7 +674,7 @@ static size_t itemUsage(FILE * fp, size_t cursor, { int i; - /*@-branchstate@*/ /* FIX: W2DO? */ +/*@-branchstate@*/ /* FIX: W2DO? */ if (item != NULL) for (i = 0; i < nitems; i++, item++) { const struct poptOption * opt; @@ -678,7 +686,7 @@ static size_t itemUsage(FILE * fp, size_t cursor, cursor = singleOptionUsage(fp, cursor, opt, translation_domain); } } - /*@=branchstate@*/ +/*@=branchstate@*/ return cursor; } @@ -709,7 +717,7 @@ static size_t singleTableUsage(poptContext con, FILE * fp, size_t cursor, /*@globals fileSystem @*/ /*@modifies *fp, done, fileSystem @*/ { - /*@-branchstate@*/ /* FIX: W2DO? */ +/*@-branchstate@*/ /* FIX: W2DO? */ if (opt != NULL) for (; (opt->longName || opt->shortName || opt->arg) ; opt++) { if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) { @@ -740,7 +748,7 @@ static size_t singleTableUsage(poptContext con, FILE * fp, size_t cursor, cursor = singleOptionUsage(fp, cursor, opt, translation_domain); } } - /*@=branchstate@*/ +/*@=branchstate@*/ return cursor; } @@ -753,15 +761,16 @@ static size_t singleTableUsage(poptContext con, FILE * fp, size_t cursor, * @retval str concatenation of short options * @return length of display string */ -static int showShortOptions(const struct poptOption * opt, FILE * fp, +static size_t showShortOptions(const struct poptOption * opt, FILE * fp, /*@null@*/ char * str) /*@globals fileSystem @*/ /*@modifies *str, *fp, fileSystem @*/ /*@requires maxRead(str) >= 0 @*/ { /* bufsize larger then the ascii set, lazy alloca on top level call. */ - char * s = (str != NULL ? str : memset(alloca(300), 0, 300)); - int len = 0; + size_t nb = (size_t)300; + char * s = (str != NULL ? str : memset(alloca(nb), 0, nb)); + size_t len = (size_t)0; /*@-boundswrite@*/ if (opt != NULL) @@ -775,7 +784,7 @@ static int showShortOptions(const struct poptOption * opt, FILE * fp, /*@=boundswrite@*/ /* On return to top level, print the short options, return print length. */ - if (s == str && *s != '\0') { + if (s != str && *s != '\0') { fprintf(fp, " [-%s]", s); len = strlen(s) + sizeof(" [-]")-1; } @@ -805,7 +814,7 @@ void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags) if (con->otherHelp) { cursor += strlen(con->otherHelp) + 1; - if (cursor > 79) fprintf(fp, "\n "); + if (cursor > _POPTHELP_MAXLINE) fprintf(fp, "\n "); fprintf(fp, " %s", con->otherHelp); } @@ -74,7 +74,7 @@ struct poptContext_s { /*@only@*/ /*@null@*/ poptItem aliases; int numAliases; - int flags; + unsigned int flags; /*@owned@*/ /*@null@*/ poptItem execs; int numExecs; @@ -82,6 +82,7 @@ struct poptContext_s { const char ** finalArgv; int finalArgvCount; int finalArgvAlloced; + int (*maincall) (int argc, const char **argv); /*@dependent@*/ /*@null@*/ poptItem doExec; /*@only@*/ @@ -113,4 +114,9 @@ struct poptContext_s { #define N_(foo) foo +#define POPT_WARNING "(popt): Warning **: " + +int POPT_fprintf (FILE* steam, const char *format, ...); +char *POPT_prev_char (const char *str); + #endif diff --git a/poptparse.c b/poptparse.c index a0dea80..f7190c4 100644 --- a/poptparse.c +++ b/poptparse.c @@ -33,12 +33,12 @@ int poptDupArgv(int argc, const char **argv, argv2 = (void *) dst; dst += (argc + 1) * sizeof(*argv); - /*@-branchstate@*/ +/*@-branchstate@*/ for (i = 0; i < argc; i++) { argv2[i] = dst; dst += strlen(strcpy(dst, argv[i])) + 1; } - /*@=branchstate@*/ +/*@=branchstate@*/ argv2[argc] = NULL; if (argvPtr) { @@ -61,7 +61,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr) int argvAlloced = POPT_ARGV_ARRAY_GROW_DELTA; const char ** argv = malloc(sizeof(*argv) * argvAlloced); int argc = 0; - int buflen = strlen(s) + 1; + size_t buflen = strlen(s) + 1; char * buf = memset(alloca(buflen), 0, buflen); int rc = POPT_ERROR_MALLOC; @@ -133,11 +133,11 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags) char * p; char * q; char * x; - int t; - int argvlen = 0; + size_t t; + size_t argvlen = 0; size_t maxlinelen = sizeof(line); size_t linelen; - int maxargvlen = 480; + size_t maxargvlen = (size_t)480; int linenum = 0; *argstrp = NULL; @@ -205,7 +205,7 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags) /* now, loop and strip all ending whitespace */ x = p + linelen; while (isspace(*--x)) - *x = 0; /* null out last char if space (including fgets() NL) */ + *x = '\0'; /* null out last char if space (including fgets() NL) */ /* rest of line accept */ t = x - p; @@ -1,3 +1,7 @@ +/** + * \file popt/system.h + */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -73,7 +73,7 @@ static struct poptOption moreCallbackArgs[] = { { NULL, '\0', POPT_ARG_CALLBACK|POPT_CBFLAG_INC_DATA, (void *)option_callback, 0, NULL, NULL }, - { "cb2", 'c', POPT_ARG_STRING, NULL, 'c', + { "cb2", 'c', POPT_ARG_STRING, NULL, (int)'c', "Test argument callbacks", NULL }, POPT_TABLEEND }; @@ -82,9 +82,9 @@ static struct poptOption moreCallbackArgs[] = { static struct poptOption callbackArgs[] = { { NULL, '\0', POPT_ARG_CALLBACK, (void *)option_callback, 0, "sampledata", NULL }, - { "cb", 'c', POPT_ARG_STRING, NULL, 'c', + { "cb", 'c', POPT_ARG_STRING, NULL, (int)'c', "Test argument callbacks", NULL }, - { "longopt", '\0', 0, NULL, 'l', + { "longopt", '\0', 0, NULL, (int)'l', "Unused option for help testing", NULL }, POPT_TABLEEND }; @@ -245,7 +245,7 @@ int main(int argc, const char ** argv) fprintf(stdout, " aLong: %ld", aLong); /*@-realcompare@*/ if (aFloat != bFloat) - fprintf(stdout, " aFloat: %g", aFloat); + fprintf(stdout, " aFloat: %g", (double)aFloat); if (aDouble != bDouble) fprintf(stdout, " aDouble: %g", aDouble); /*@=realcompare@*/ @@ -1,5 +1,3 @@ -/* vim:ts=8:sts=4 */ - #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -9,7 +7,7 @@ int main (int argc, char **argv) { char *out; int newargc, j, f, ret; - char **newargv; + const char **newargv; FILE *fp; if (argc == 1) { @@ -76,8 +76,8 @@ run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -onedash run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --onedash run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo -run test1 "test1 - 27" "arg1: 0 arg2: (none) -" - -run test1 "test1 - 28" "arg1: 0 arg2: foo -" - -2 foo +run test1 "test1 - 27" "arg1: 0 arg2: (none) rest: -" - +run test1 "test1 - 28" "arg1: 0 arg2: foo rest: -" - -2 foo run test1 "test1 - 29" "arg1: 0 arg2: bbbb" --arg2=aaaa -2 bbbb run test1 "test1 - 30" "arg1: 0 arg2: 'foo bingo' rest: boggle" --grab bingo boggle run test1 "test1 - 31" "arg1: 0 arg2: 'foo bar' rest: boggle" --grabbar boggle |