From 5355e6bcbf38281b0541710913434decf1379e3f Mon Sep 17 00:00:00 2001 From: fangzhiyi18 Date: Mon, 13 May 2024 11:13:25 +0000 Subject: [PATCH] =?UTF-8?q?popt=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fangzhiyi18 --- .gitignore | 51 +++++++------ COPYING | 13 ++-- CREDITS | 53 ++++++++++++++ Doxyfile.in | 16 ++--- Makefile.am | 2 +- OAT.xml | 2 +- README | 4 +- README.OpenSource | 6 +- autogen.sh | 2 +- ci/Dockerfile | 8 +-- configure.ac | 33 +++++---- po/LINGUAS | 2 +- po/ca.po | 148 ++++++++++++++++++++++++++++++++++++++ po/cs.po | 34 +++++---- po/da.po | 49 +++++++------ po/de.po | 47 ++++++------ po/eo.po | 34 +++++---- po/es.po | 68 ++++++++++-------- po/fi.po | 51 +++++++------ po/fr.po | 64 +++++++++-------- po/ga.po | 34 +++++---- po/gl.po | 34 +++++---- po/hu.po | 66 +++++++++-------- po/id.po | 49 +++++++------ po/is.po | 34 +++++---- po/it.po | 34 +++++---- po/ja.po | 34 +++++---- po/ka.po | 147 +++++++++++++++++++++++++++++++++++++ po/ko.po | 61 +++++++++------- po/lv.po | 34 +++++---- po/nb.po | 34 +++++---- po/nl.po | 49 +++++++------ po/pl.po | 78 +++++++++++--------- po/popt.pot | 36 +++++----- po/pt.po | 63 ++++++++-------- po/pt_BR.po | 148 ++++++++++++++++++++++++++++++++++++++ po/ro.po | 34 +++++---- po/ru.po | 38 +++++----- po/si.po | 147 +++++++++++++++++++++++++++++++++++++ po/sk.po | 34 +++++---- po/sl.po | 34 +++++---- po/sv.po | 47 ++++++------ po/th.po | 34 +++++---- po/tr.po | 95 ++++++++++++------------ po/uk.po | 103 +++++++++++++------------- po/vi.po | 34 +++++---- po/wa.po | 34 +++++---- po/zh_CN.po | 51 +++++++------ po/zh_TW.po | 34 +++++---- popt.3 | 133 ++++++++++++++++++++++++---------- popt.pc.in | 1 + src/Makefile.am | 2 +- src/lookup3.c | 16 ++--- src/popt.c | 143 +++++++++++++++++++----------------- src/popt.h | 137 +++++++++++++++-------------------- src/poptconfig.c | 18 +++-- src/popthelp.c | 28 ++++---- src/poptint.c | 21 ++++-- src/poptint.h | 8 ++- src/poptparse.c | 27 ++++--- src/system.h | 6 +- tests/Makefile.am | 17 +++-- tests/tdict.c | 7 +- tests/test1.c | 12 ++-- tests/test2.c | 62 ++++++++-------- tests/test3-data/01.input | 4 +- tests/test3.c | 7 +- tests/testit.sh | 43 ++++++----- 68 files changed, 1975 insertions(+), 1058 deletions(-) create mode 100644 CREDITS mode change 100755 => 100644 autogen.sh create mode 100644 po/ca.po create mode 100644 po/ka.po create mode 100644 po/pt_BR.po create mode 100644 po/si.po mode change 100755 => 100644 tests/testit.sh diff --git a/.gitignore b/.gitignore index 3bd1515..3e1cd4c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,50 +1,55 @@ .ccache -.deps +.deps/ .depend -.libs +.libs/ ABOUT-NLS ChangeLog Doxyfile Makefile Makefile.in -aclocal.m4 -autom4te* +/aclocal.m4 +/autom4te* build clang -config.cache -config.guess -config.h -config.h.in -config.log -config.rpath -config.status -config.sub -configure +/config.* +/configure doxygen -depcomp -install-sh intl lconv libtool -ltconfig -ltmain.sh -m4 -missing -mkinstalldirs +/m4/ popt.spec stamp-h stamp-h1 stamp-h.in tdict test-poptrc -test1 -test2 -test3 +/tests/test-suite.log +/tests/testit.sh.log +/tests/testit.sh.trs +/tests/test1 +/tests/test2 +/tests/test3 *.gcda *.gcno +*.gmo *.la *.lcd *.lo *.swp +*.o popt.pc popt-*.tar.gz + +/build-aux/ +/po/Makefile.in.in +/po/Makevars.template +/po/POTFILES +/po/Rules-quot +/po/boldquot.sed +/po/en@boldquot.header +/po/en@quot.header +/po/insert-header.sin +/po/quot.sed +/po/remove-potcdate.sin +/po/stamp-po diff --git a/COPYING b/COPYING index b4c7ca8..b00173c 100644 --- a/COPYING +++ b/COPYING @@ -12,11 +12,8 @@ all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the X Consortium shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the X Consortium. +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/CREDITS b/CREDITS new file mode 100644 index 0000000..8643a3d --- /dev/null +++ b/CREDITS @@ -0,0 +1,53 @@ +Initial work on POPT was done primarily by: + + Jeff Johnson + Erik Troan + +Over the years, additional code, documentation, translations, tests etc +have been contributed by: + + Ettore Atalan + John Bradshaw + Hela Basa + Yuri Chornoivan + Gustavo Costa + Wayne Davison + Michal Domonkos + Piotr Drąg + Jan Engelhardt + Ralf S. Engelschall + Oğuz Ersen + Marc Ewing + Fabrice Fontaine + Rafael Fontenelle + Cristian Gafton + Neal Gompa + Christian Göttsche + Emilio Herrera + Jean-Baptiste Holcroft + Michael K. Johnson + Peter Jones + Charles Lee + Elliot Lee + Dmitry V. Levin + Richard Levitte + Carl Henrik Lunde + Jordi Mallach + Balázs Meskó + Arkadiusz Miskiewicz + Panu Matilainen + Paul Nasrat + Elia Pinto + Bernhard Rosenkränzer + Andreas Schwab + Robert Scheck + scootergrisen + simmon + Tobias Stoeckmann + Ricky Tigg + Alexander Traud + Andika Triwidada + Miloslav Trmač + Göran Uddeborg + Geert Warrink + Jakub Wilk diff --git a/Doxyfile.in b/Doxyfile.in index 84abd05..706d82c 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -460,14 +460,14 @@ WARN_LOGFILE = # with spaces. INPUT = \ - ./popt.c \ - ./popt.h \ - ./poptconfig.c \ - ./popthelp.c \ - ./poptint.c \ - ./poptint.h \ - ./poptparse.c \ - ./system.h + ./src/popt.c \ + ./src/popt.h \ + ./src/poptconfig.c \ + ./src/popthelp.c \ + ./src/poptint.c \ + ./src/poptint.h \ + ./src/poptparse.c \ + ./src/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 diff --git a/Makefile.am b/Makefile.am index e2cbfa7..01961f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ MCCABE = pmccabe -EXTRA_DIST = autogen.sh CHANGES $(man_MANS) ci/Dockerfile build-aux popt.pdf +EXTRA_DIST = autogen.sh CREDITS $(man_MANS) ci/Dockerfile build-aux popt.pdf SUBDIRS = src po tests diff --git a/OAT.xml b/OAT.xml index 199c1cb..3b5a855 100644 --- a/OAT.xml +++ b/OAT.xml @@ -100,7 +100,7 @@ Note:If the text contains special characters, please escape them according to th - + diff --git a/README b/README index 15ce387..81247b9 100644 --- a/README +++ b/README @@ -1,11 +1,11 @@ -This is the popt(3) command line option parsing library. While it is similiar +This is the popt(3) command line option parsing library. While it is similar to getopt(3), it contains a number of enhancements, including: 1) popt is fully reentrant 2) popt can parse arbitrary argv[] style arrays while getopt(3) makes this quite difficult 3) popt allows users to alias command line arguments - 4) popt provides convience functions for parsing strings + 4) popt provides convenience functions for parsing strings into argv[] style arrays Complete documentation on popt(3) is available in popt.pdf (included in this diff --git a/README.OpenSource b/README.OpenSource index b5e0191..ec8f638 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -3,9 +3,9 @@ "Name" : "Popt", "License" : "MIT License", "License File" : "COPYING", - "Version Number" : "1.18", - "Owner" : "ningzuobin@huawei.com", - "Upstream URL" : "https://github.com/rpm-software-management/popt/tree/popt-1.18-release", + "Version Number" : "1.19", + "Owner" : "zhuyan34@huawei.com", + "Upstream URL" : "https://github.com/rpm-software-management/popt/tree/popt-1.19-release", "Description" : "Popt is a C library for parsing command line parameters." } ] diff --git a/autogen.sh b/autogen.sh old mode 100755 new mode 100644 index 22632ed..8c5e9eb --- a/autogen.sh +++ b/autogen.sh @@ -1,3 +1,3 @@ #!/bin/sh -autoreconf -vi +autoreconf -vif -Wall diff --git a/ci/Dockerfile b/ci/Dockerfile index cf0d55c..09e04eb 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:latest +FROM registry.fedoraproject.org/fedora:36 MAINTAINER rpm-maint@lists.rpm.org WORKDIR /srv/popt @@ -18,8 +18,8 @@ RUN dnf -y install \ COPY . . -RUN autoreconf -vi -RUN ./configure +RUN ./autogen.sh +RUN ./configure --enable-werror CFLAGS="-Wall -Wdeclaration-after-statement -Wextra -Wmissing-format-attribute -Wmissing-noreturn -Wno-gnu-alignof-expression -Wpointer-arith -Wshadow -Wstrict-prototypes -Wundef -Wunused -Wwrite-strings" RUN make -CMD make distcheck +CMD make distcheck DISTCHECK_CONFIGURE_FLAGS=--enable-werror diff --git a/configure.ac b/configure.ac index a5568c4..8712ba1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_PREREQ(2.57) -AC_INIT(popt, 1.18, rpm-maint@lists.rpm.org) +AC_PREREQ([2.57]) +AC_INIT([popt], [1.19], [rpm-maint@lists.rpm.org]) AC_CONFIG_SRCDIR([src/popt.h]) AC_CONFIG_HEADERS([config.h]) @@ -8,17 +8,17 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.10 foreign -Wall]) -AC_PROG_CC_STDC +m4_version_prereq([2.70], [], [AC_PROG_CC_STDC]) AC_PROG_CC AC_USE_SYSTEM_EXTENSIONS AM_PROG_AR AC_PROG_INSTALL -AC_PROG_LIBTOOL +LT_INIT AC_SYS_LARGEFILE -AC_CHECK_HEADERS(fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h) +AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h]) # For some systems we know that we have ld_version scripts. # Use it then as default. @@ -32,15 +32,15 @@ case "${host}" in ;; esac AC_ARG_ENABLE([ld-version-script], - AC_HELP_STRING([--enable-ld-version-script], + [AS_HELP_STRING([--enable-ld-version-script], [enable/disable use of linker version script. - (default is system dependent)]), + (default is system dependent)])], [have_ld_version_script=$enableval], [ : ] ) AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") -AC_ARG_ENABLE(build-gcov, - AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov]), [dnl +AC_ARG_ENABLE([build-gcov], + [AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov])], [dnl if test ".$enableval" = .yes; then if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then dnl # GNU GCC (usually "gcc") @@ -49,13 +49,22 @@ AC_ARG_ENABLE(build-gcov, fi ]) -AC_SEARCH_LIBS(setreuid, [ucb]) -AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom) +AC_SEARCH_LIBS([setreuid], [ucb]) +AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p mbsrtowcs]) -AM_GNU_GETTEXT_VERSION([0.18.2]) +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) AM_GNU_GETTEXT([external]) AM_ICONV_LINK +AC_ARG_ENABLE([werror], + [AS_HELP_STRING([--enable-werror], + [Treat warnings as errors (default: warnings are not errors)])], + [enable_werror="$enableval"], + [enable_werror=no]) +AS_IF([test "x$enable_werror" = "xyes"], [AM_CFLAGS="$AM_CFLAGS -Werror"]) +AC_SUBST([AM_CFLAGS]) + AC_CONFIG_SUBDIRS() AC_CONFIG_FILES([ po/Makefile.in Doxyfile Makefile src/Makefile popt.pc tests/test-poptrc tests/Makefile diff --git a/po/LINGUAS b/po/LINGUAS index 916a129..72f6829 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -cs da de eo es fi fr ga gl hu id is it ja ko lv nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN +ca cs da de eo es fi fr ga gl hu id is it ja ka ko lv nb nl pl pt pt_BR ro ru si sk sl sv th tr uk vi wa zh_CN zh_TW diff --git a/po/ca.po b/po/ca.po new file mode 100644 index 0000000..db5b2d2 --- /dev/null +++ b/po/ca.po @@ -0,0 +1,148 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Panu Matilainen , 2020. +# Jordi Mallach , 2020. +msgid "" +msgstr "" +"Project-Id-Version: popt 1.18\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2020-09-03 12:48+0000\n" +"Last-Translator: Jordi Mallach \n" +"Language-Team: Catalan \n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.2.2\n" + +#: src/popt.c:46 +msgid "unknown errno" +msgstr "número d'error desconegut" + +#: src/popt.c:1200 +#, c-format +msgid "option type (%u) not implemented in popt\n" +msgstr "el tipus d'opció (%u) no està implementat en popt\n" + +#: src/popt.c:1638 +msgid "missing argument" +msgstr "manca un argument" + +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 +msgid "unknown option" +msgstr "opció desconeguda" + +#: src/popt.c:1644 +msgid "mutually exclusive logical operations requested" +msgstr "s'ha demanat operacions lògiques mutuament excloents" + +#: src/popt.c:1646 +msgid "opt->arg should not be NULL" +msgstr "opt->arg no hauria de ser NULL" + +#: src/popt.c:1648 +msgid "aliases nested too deeply" +msgstr "la recursió d'àlias és massa profunda" + +#: src/popt.c:1650 +msgid "error in parameter quoting" +msgstr "hi ha un error en l'entrecomillat dels paràmetres" + +#: src/popt.c:1652 +msgid "invalid numeric value" +msgstr "el valor numèric és invàlid" + +#: src/popt.c:1654 +msgid "number too large or too small" +msgstr "el número és massa gran o massa petit" + +#: src/popt.c:1656 +msgid "memory allocation failed" +msgstr "l'assignació de memòria ha fallat" + +#: src/popt.c:1658 +msgid "config file failed sanity test" +msgstr "" + +#: src/popt.c:1662 +msgid "unknown error" +msgstr "s'ha produït un error desconegut" + +#: src/popthelp.c:64 src/popthelp.c:72 +msgid "Show this help message" +msgstr "Mostra aquest missatge d'ajuda" + +#: src/popthelp.c:65 src/popthelp.c:73 +msgid "Display brief usage message" +msgstr "Mostra un missatge breu d'ús" + +#: src/popthelp.c:76 +msgid "Display option defaults in message" +msgstr "Mostra els valors predeterminats de les opcions al missatge" + +#: src/popthelp.c:78 +msgid "Terminate options" +msgstr "" + +#: src/popthelp.c:170 +msgid "Help options:" +msgstr "" + +#: src/popthelp.c:171 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: src/popthelp.c:179 +msgid "NONE" +msgstr "CAP" + +#: src/popthelp.c:181 +msgid "VAL" +msgstr "VAL" + +#: src/popthelp.c:185 +msgid "INT" +msgstr "INT" + +#: src/popthelp.c:186 +msgid "SHORT" +msgstr "" + +#: src/popthelp.c:187 +msgid "LONG" +msgstr "LONG" + +#: src/popthelp.c:188 +msgid "LONGLONG" +msgstr "LONGLONG" + +#: src/popthelp.c:189 +msgid "STRING" +msgstr "STRING" + +#: src/popthelp.c:190 +msgid "FLOAT" +msgstr "FLOAT" + +#: src/popthelp.c:191 +msgid "DOUBLE" +msgstr "DOUBLE" + +#: src/popthelp.c:194 +msgid "ARG" +msgstr "ARG" + +#: src/popthelp.c:615 +msgid "Usage:" +msgstr "Forma d'ús:" + +#: src/popthelp.c:640 +msgid "[OPTION...]" +msgstr "[OPCIÓ...]" diff --git a/po/cs.po b/po/cs.po index 41e4bf1..a04e4b2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2008-12-08 19:55+0100\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -21,52 +21,56 @@ msgstr "" msgid "unknown errno" msgstr "neznámé číslo chyby" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "typ volby (%u) není v popt implementován\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "chybí argument" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "neznámá volba" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "požadovány vzájemně výlučné logické operace" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg nesmí být NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "aliasy vnořené příliš hluboko" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "chyba v quotování parametrů" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "chybná numerická hodnota" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "číslo je příliš velké nebo příliš malé" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "selhala alokace paměti" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "neznámá chyba" @@ -134,10 +138,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Použití:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[VOLBY…]" diff --git a/po/da.po b/po/da.po index d606a30..04c36fd 100644 --- a/po/da.po +++ b/po/da.po @@ -3,70 +3,77 @@ # This file is distributed under the same license as the popt package. # Martin Hansen , 2001. # Joe Hansen , 2008. -# +# scootergrisen , 2020. msgid "" msgstr "" "Project-Id-Version: popt-1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2008-09-15 00:00+0000\n" -"Last-Translator: Joe Hansen \n" -"Language-Team: Danish \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2020-11-17 03:35+0000\n" +"Last-Translator: scootergrisen \n" +"Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #: src/popt.c:46 msgid "unknown errno" msgstr "ukendt fejlnr." -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "tilvalgstype (%u) er ikke implementeret i popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "mangler argument" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "ukendt tilvalg" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "de ønskede handlinger udelukker hinanden" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg bør ikke være NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "aliaser er for dybt indlejret" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "fejl i parameter citering" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "ugyldig numerisk værdi" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "nummer for stort, eller for lille" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "hukommelsestildeling mislykkedes" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "konfigurationsfil mislykkede tilregnelighedstest" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "ukendt fejl" @@ -108,7 +115,7 @@ msgstr "INT" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "SHORT" #: src/popthelp.c:187 msgid "LONG" @@ -134,10 +141,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Brug:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[TILVALG...]" diff --git a/po/de.po b/po/de.po index f15c55d..e7c526e 100644 --- a/po/de.po +++ b/po/de.po @@ -2,70 +2,77 @@ # This file is distributed under the same license as the popt package. # Robert Scheck , 2004-2007. # Roland Illig , 2009. -# +# Ettore Atalan , 2021. msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2009-11-10 19:58+0100\n" -"Last-Translator: Roland Illig \n" -"Language-Team: German \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2021-12-28 22:16+0000\n" +"Last-Translator: Ettore Atalan \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.10.1\n" #: src/popt.c:46 msgid "unknown errno" msgstr "Unbekannte Fehler-Nummer" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "Optionstyp (%u) ist in popt nicht vorhanden\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "Fehlendes Argument" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "Unbekannte Option" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "Gegenseitig ausschließende logische Operatoren" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg sollte nicht NULL sein" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "Aliase zu tief verschachtelt" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "Fehler beim Quotieren der Parameter" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "Ungültiger nummerischer Wert" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "Nummer zu groß oder zu klein" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "Speicherzuordnung fehlgeschlagen" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "Unbekannter Fehler" @@ -107,7 +114,7 @@ msgstr "INTEGER" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "SHORT" #: src/popthelp.c:187 msgid "LONG" @@ -133,10 +140,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARGUMENT" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Verwendung:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[OPTION...]" diff --git a/po/eo.po b/po/eo.po index bcd95a2..0795d37 100644 --- a/po/eo.po +++ b/po/eo.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2008-08-03 15:50-0300\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -19,52 +19,56 @@ msgstr "" msgid "unknown errno" msgstr "nekonata erarnumero" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "la opcia tipo (%u) ne estas realigita en popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "mankas argumento" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "nekonata opcio" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "reciprokaj logikaj operacioj estas postulataj" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg ne devus esti NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "kromnomoj estas ingitaj tro profunde" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "eraro en parametra citado" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "nevalida numera valoro" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "numero tro granda aŭ tro eta" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "malsukceso dum okupado de memoro" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "nekonata eraro" @@ -132,10 +136,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Uzado:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[OPCIO...]" diff --git a/po/es.po b/po/es.po index 1231244..8856b54 100644 --- a/po/es.po +++ b/po/es.po @@ -1,70 +1,77 @@ # Spanish translations for popt. # Copyright (C) 2007 Free Software Foundation, Inc. # Leandro Lucarella , 2007 -# +# Emilio Herrera , 2021. msgid "" msgstr "" "Project-Id-Version: popt 1.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2007-12-28 12:22+0100\n" -"Last-Translator: Leandro Lucarella \n" -"Language-Team: Spanish \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2021-08-23 13:04+0000\n" +"Last-Translator: Emilio Herrera \n" +"Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.8\n" #: src/popt.c:46 msgid "unknown errno" msgstr "errno desconocido" -#: src/popt.c:1206 -#, fuzzy, c-format +#: src/popt.c:1200 +#, c-format msgid "option type (%u) not implemented in popt\n" -msgstr "tipo de opción (%d) no implementada en popt\n" +msgstr "tipo de opción (%u) no implementada en popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "falta argumento" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "opción desconocida" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "requerida operación lógica mutuamente exclusiva" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" -msgstr "" +msgstr "opt->argumento no debería ser NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "alias anidados muy profundamente" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "error en cita de parámetros" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "valor numérico inválido" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "número muy largo o muy pequeño" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" -msgstr "" +msgstr "fallo en la asignación de memoria" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "fallo en la prueba de sanidad en el archivo de configuración" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "error desconocido" @@ -78,19 +85,19 @@ msgstr "Indica el modo de uso resumido" #: src/popthelp.c:76 msgid "Display option defaults in message" -msgstr "" +msgstr "Opciones de visualización predeterminadas en el mensaje" #: src/popthelp.c:78 msgid "Terminate options" -msgstr "" +msgstr "Opciones finalizadas" #: src/popthelp.c:170 msgid "Help options:" -msgstr "" +msgstr "Opciones de ayuda:" #: src/popthelp.c:171 msgid "Options implemented via popt alias/exec:" -msgstr "" +msgstr "Opciones implementadas por medio de popt alias/exec:" #: src/popthelp.c:179 msgid "NONE" @@ -106,16 +113,15 @@ msgstr "INT" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "CORTO" #: src/popthelp.c:187 msgid "LONG" msgstr "LONG" #: src/popthelp.c:188 -#, fuzzy msgid "LONGLONG" -msgstr "LONG" +msgstr "LONGLONG" #: src/popthelp.c:189 msgid "STRING" @@ -133,10 +139,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Modo de uso:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[OPCIÓN...]" diff --git a/po/fi.po b/po/fi.po index 867ac86..7ff8e36 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3,73 +3,78 @@ # This file is distributed under the same license as the popt package. # This file is put in the public domain. # Jorma Karvonen , 2008. -# +# Ricky Tigg , 2020. msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2008-02-21 18:19+0200\n" -"Last-Translator: Jorma Karvonen \n" -"Language-Team: Finnish \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2020-12-02 14:36+0000\n" +"Last-Translator: Ricky Tigg \n" +"Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" # errno - number of last error (defined by the ISO C standard) #: src/popt.c:46 msgid "unknown errno" msgstr "tuntematon errno-virhenumeroarvo" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "valitsintyyppiä (%u) ei ole toteutettu popt-ohjelmassa\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "puuttuva argumentti" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "tuntematon valitsin" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "pyydettyjä loogisia toimintoja ei voi käyttää yhdessä" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "”opt->arg”-valitsinargumentti ei saa olla NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "liian monta aliasta sisäkkäin" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "virhe parametrien lainauksessa" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "virheellinen numeroarvo" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "numero on liian iso tai liian pieni" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "muistin varaus ei onnistunut" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "kokoonpanotiedosto epäonnistui terveystestissä" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "tuntematon virhe" @@ -113,7 +118,7 @@ msgstr "INT-KOKONAISLUKU" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "LYHYT" #: src/popthelp.c:187 msgid "LONG" @@ -139,10 +144,10 @@ msgstr "DOUBLE-LIUKULUKU" msgid "ARG" msgstr "ARGUMENTTI" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Käyttö:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[VALITSIN...]" diff --git a/po/fr.po b/po/fr.po index 9567bbb..a04c695 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,74 +3,81 @@ # This file is distributed under the same license as the RPM package. # RPM French Translation , 2003. # JBJ : THANX A LOT !!! +# Jean-Baptiste Holcroft , 2020. # # N'hésitez pas à m'envoyez un courriel si vous avez des # suggestions/corrections. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2003-06-22 23:43+0200\n" -"Last-Translator: RPM French Translation \n" -"Language-Team: RPM French Translation \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2020-08-21 05:41+0000\n" +"Last-Translator: Jean-Baptiste Holcroft \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.1.1\n" #: src/popt.c:46 msgid "unknown errno" msgstr "errno inconnu" -#: src/popt.c:1206 -#, fuzzy, c-format +#: src/popt.c:1200 +#, c-format msgid "option type (%u) not implemented in popt\n" -msgstr "type(%d) d'option non implémenté dans popt\n" +msgstr "Le type d'option (%u) n'est pas implémenté dans popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "argument manquant" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "option iconnue" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "opérations logiques mutuellement exclusives requises" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg ne devrait pas être NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "les alias sont trop entremellés" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "erreur en citant les paramètres" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "valeur numérique invalide" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "nombre trop grand ou trop petit" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "échec de l'allocation de mémoire" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "les tests d'évaluation du fichier de configuration a échoué" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "erreur inconnue" @@ -88,15 +95,15 @@ msgstr "Afficher les valeurs par défaut des options dans le message" #: src/popthelp.c:78 msgid "Terminate options" -msgstr "" +msgstr "Terminer les options" #: src/popthelp.c:170 msgid "Help options:" -msgstr "" +msgstr "Options d'aide :" #: src/popthelp.c:171 msgid "Options implemented via popt alias/exec:" -msgstr "" +msgstr "Options implémentées via popt alias/exec :" #: src/popthelp.c:179 msgid "NONE" @@ -112,16 +119,15 @@ msgstr "ENTIER" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "COURT" #: src/popthelp.c:187 msgid "LONG" msgstr "LONG" #: src/popthelp.c:188 -#, fuzzy msgid "LONGLONG" -msgstr "LONG" +msgstr "LONG LONG" #: src/popthelp.c:189 msgid "STRING" @@ -139,10 +145,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" -msgstr "Utilisation:" +msgstr "Utilisation :" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[OPTION...]" diff --git a/po/ga.po b/po/ga.po index f524a89..2256b23 100644 --- a/po/ga.po +++ b/po/ga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2008-04-10 06:21-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -19,52 +19,56 @@ msgstr "" msgid "unknown errno" msgstr "errno anaithnid" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "níl an cineál rogha seo (%u) ar fáil i popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "argóint ar iarraidh" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "rogha anaithnid" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "iarradh oibríochtaí loighciúla comheisiacha" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "níor chóir rogha->arg a bheith NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "ailiasanna neadaithe ródhomhain" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "luach neamhbhailí uimhriúil" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "uimhir rómhór nó róbheag" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "theip ar dháileadh na cuimhne" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "earráid anaithnid" @@ -133,10 +137,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Úsáid:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[ROGHA...]" diff --git a/po/gl.po b/po/gl.po index cd81245..6bc8aff 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2001-01-17 01:01+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -15,52 +15,56 @@ msgstr "" msgid "unknown errno" msgstr "errno descoñecido" -#: src/popt.c:1206 +#: src/popt.c:1200 #, fuzzy, c-format msgid "option type (%u) not implemented in popt\n" msgstr "tipo de opción (%d) non implementada en popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "falta un argumento" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "opción descoñecida" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "solicitáronse operacións lóxicas mutuamente excluíntes" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "aliases aniñados a un nivel demasiado profundo" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "erro nas comiñas do parámetro" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "valor numérico non válido" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "número demasiado grande ou pequeno" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "erro descoñecido" @@ -130,10 +134,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Uso:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[OPCIÓN...]" diff --git a/po/hu.po b/po/hu.po index 6d50957..a0173ee 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,71 +1,77 @@ # Hungarian translation of popt # Copyright (C) 2007 Free Software Foundation, Inc. # Gabor Kelemen , 2007. +# Balázs Meskó , 2021. msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2007-06-21 00:45+0200\n" -"Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2021-02-10 19:40+0000\n" +"Last-Translator: Balázs Meskó \n" +"Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.4.2\n" #: src/popt.c:46 msgid "unknown errno" msgstr "ismeretlen hibaszám" -#: src/popt.c:1206 -#, fuzzy, c-format +#: src/popt.c:1200 +#, c-format msgid "option type (%u) not implemented in popt\n" -msgstr "a kapcsolótípus (%d) nincs megvalósítva a popt-ban\n" +msgstr "a kapcsolótípus (%u) nincs megvalósítva a poptban\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" -msgstr "hiányzó paraméter" +msgstr "hiányzó argumentum" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "ismeretlen kapcsoló" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "kölcsönösen kizáró logikai műveleteket kért" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "az opt->arg nem lehet NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "az álnevek túl mélyen vannak egymásba ágyazva" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "hiba a paraméter idézésében" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "érvénytelen numerikus érték" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "a szám túl nagy vagy túl kicsi" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" -msgstr "a memóriafoglalás meghiúsult" +msgstr "a memóriafoglalás sikertelen" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "a konfigurációs fájl megbukott az ellenőrzésen" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "ismeretlen hiba" @@ -82,13 +88,12 @@ msgid "Display option defaults in message" msgstr "Kapcsolók alapértelmezéseinek megjelenítése" #: src/popthelp.c:78 -#, fuzzy msgid "Terminate options" -msgstr "Súgólehetőségek:" +msgstr "Leállítási kapcsolók" #: src/popthelp.c:170 msgid "Help options:" -msgstr "Súgólehetőségek:" +msgstr "Súgó kapcsolók:" #: src/popthelp.c:171 msgid "Options implemented via popt alias/exec:" @@ -108,16 +113,15 @@ msgstr "EGÉSZ" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "RÖVID" #: src/popthelp.c:187 msgid "LONG" msgstr "HOSSZÚ" #: src/popthelp.c:188 -#, fuzzy msgid "LONGLONG" -msgstr "HOSSZÚ" +msgstr "DUPLAHOSSZÚ" #: src/popthelp.c:189 msgid "STRING" @@ -135,10 +139,10 @@ msgstr "DUPLA" msgid "ARG" msgstr "PAR" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Használat:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[KAPCSOLÓ...]" diff --git a/po/id.po b/po/id.po index 42186e2..1f3697d 100644 --- a/po/id.po +++ b/po/id.po @@ -1,70 +1,77 @@ # Indonesian translations for popt package. # This file is put in the public domain. # Andhika Padmawan , 2008. -# +# Andika Triwidada , 2020. msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2008-08-26 14:18+0700\n" -"Last-Translator: Andhika Padmawan \n" -"Language-Team: Indonesian \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2020-12-17 08:36+0000\n" +"Last-Translator: Andika Triwidada \n" +"Language-Team: Indonesian \n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 4.3.2\n" #: src/popt.c:46 msgid "unknown errno" msgstr "errno tak diketahui" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "tipe opsi (%u) tak diimplementasikan di popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "kehilangan argumen" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "opsi tak diketahui" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "permintaan operasi logika eksklusif secara mutual" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg tidak boleh NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "alias disarangkan terlalu dalam" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "galat di pencantuman parameter" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "nilai numerik tidak sah" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "nomor terlalu besar atau terlalu kecil" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "alokasi memori gagal" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "berkas konfig gagal uji kewarasan" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "galat tak diketahui" @@ -106,7 +113,7 @@ msgstr "INT" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "SHORT" #: src/popthelp.c:187 msgid "LONG" @@ -132,10 +139,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Penggunaan:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[OPSI...]" diff --git a/po/is.po b/po/is.po index 184c30d..c4e44d9 100644 --- a/po/is.po +++ b/po/is.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2001-06-08 01:35+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -15,52 +15,56 @@ msgstr "" msgid "unknown errno" msgstr "óþekkt villunúmer" -#: src/popt.c:1206 +#: src/popt.c:1200 #, fuzzy, c-format msgid "option type (%u) not implemented in popt\n" msgstr "rofagerðin (%d) er ekki studd í popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "vantar viðfang" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "óþekktur rofi" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "beðið um rofa sem slökkva hvor á öðrum" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg ætti ekki að vera NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "alíasar of flóknir" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "villa í viðföngum (gæsalappir og svo frv.)" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "ógilt tölulegt gildi" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "talan of stór eða smá" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "ekki tókst að taka frá minni" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "óþekkt villa" @@ -129,10 +133,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Notkun:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[ROFI...]" diff --git a/po/it.po b/po/it.po index 9d2d85e..3a8c4d5 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: popt-1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2008-11-28 15:32+0100\n" "Last-Translator: Vincenzo Campanella \n" "Language-Team: Italian \n" @@ -22,52 +22,56 @@ msgstr "" msgid "unknown errno" msgstr "errno sconosciuto" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "tipo di opzione (%u) non implementato in popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "argomento mancante" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "opzione sconosciuta" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "richieste operazioni logiche reciprocamente esclusive" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg non dovrebbe essere NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "alias nidificati troppo in profondità" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "errore nel quoting del parametro" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "valore numerico non valido" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "numero troppo grande o troppo piccolo" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "allocazione di memoria fallita" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "errore sconosciuto" @@ -135,10 +139,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Uso:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[OPZIONE...]" diff --git a/po/ja.po b/po/ja.po index 1b06ec6..f8b9903 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2003--8-25 19:00+0900\n" "Last-Translator: Yukihiro Nakai \n" "Language-Team: Japanese \n" @@ -19,52 +19,56 @@ msgstr "" msgid "unknown errno" msgstr "不明なエラー番号" -#: src/popt.c:1206 +#: src/popt.c:1200 #, fuzzy, c-format msgid "option type (%u) not implemented in popt\n" msgstr "オプションタイプ (%d) はpoptには実装されていません\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "引数がありません" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "不明なオプション" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "排他的な悪ぺーレーションが必要です" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->argはNULLではいけません" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "エイリアスのネストが深すぎます" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "パラメータのクオート付けでエラー" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "不正な数値" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "数値が大きすぎるか小さすぎます" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "メモリ確保に失敗しました" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "不明なエラー" @@ -134,10 +138,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "使い方:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[オプション...]" diff --git a/po/ka.po b/po/ka.po new file mode 100644 index 0000000..61dbdf5 --- /dev/null +++ b/po/ka.po @@ -0,0 +1,147 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Temuri Doghonadze , 2022. +msgid "" +msgstr "" +"Project-Id-Version: popt 1.18\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2022-06-24 06:18+0000\n" +"Last-Translator: Temuri Doghonadze \n" +"Language-Team: Georgian \n" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.13\n" + +#: src/popt.c:46 +msgid "unknown errno" +msgstr "შეცდომის უცნობი ნომერი" + +#: src/popt.c:1200 +#, c-format +msgid "option type (%u) not implemented in popt\n" +msgstr "პარამეტრის ტიპი (%u) ჯერ popt-ში განხორციელებული არაა\n" + +#: src/popt.c:1638 +msgid "missing argument" +msgstr "ნაკლული არგუმენტი" + +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 +msgid "unknown option" +msgstr "უცნობი პარამეტრი" + +#: src/popt.c:1644 +msgid "mutually exclusive logical operations requested" +msgstr "მოთხოვნილია ურთიერთგამომრიცხავი ლოგიკური ოპერაციები" + +#: src/popt.c:1646 +msgid "opt->arg should not be NULL" +msgstr "opt->arg ნულოვანი არ უნდა იყოს" + +#: src/popt.c:1648 +msgid "aliases nested too deeply" +msgstr "მეტსახელები მეტისმეტად ღრმადაა ჩახლართული" + +#: src/popt.c:1650 +msgid "error in parameter quoting" +msgstr "პარამეტრების ფრჩხილების შეცდომა" + +#: src/popt.c:1652 +msgid "invalid numeric value" +msgstr "არასწორი რიცხვითი მნიშვნელობა" + +#: src/popt.c:1654 +msgid "number too large or too small" +msgstr "რიცხვი მეტისმეტად დიდი ან მეტისმეტად პატარაა" + +#: src/popt.c:1656 +msgid "memory allocation failed" +msgstr "მეხსიერების გამოყოფის შეცდომა" + +#: src/popt.c:1658 +msgid "config file failed sanity test" +msgstr "კონფიგურაციის ფაილის შემოწმება წარუმატებელია" + +#: src/popt.c:1662 +msgid "unknown error" +msgstr "უცნობი შეცდომა" + +#: src/popthelp.c:64 src/popthelp.c:72 +msgid "Show this help message" +msgstr "დახმარების ამ შეტყობინების ჩვენება" + +#: src/popthelp.c:65 src/popthelp.c:73 +msgid "Display brief usage message" +msgstr "გამოყენების მოკლე შეტყობინების მიღება" + +#: src/popthelp.c:76 +msgid "Display option defaults in message" +msgstr "შეტყობინებაში პარამეტრის ნაგულისხმები მნიშვნელობების ჩვენება" + +#: src/popthelp.c:78 +msgid "Terminate options" +msgstr "პარამეტრების შეწყვეტა" + +#: src/popthelp.c:170 +msgid "Help options:" +msgstr "დახმარების პარამეტრები:" + +#: src/popthelp.c:171 +msgid "Options implemented via popt alias/exec:" +msgstr "პარამეტრები, განხორციელებულები popt-ის მეტსახელი/გაშვებით:" + +#: src/popthelp.c:179 +msgid "NONE" +msgstr "NONE" + +#: src/popthelp.c:181 +msgid "VAL" +msgstr "VAL" + +#: src/popthelp.c:185 +msgid "INT" +msgstr "INT" + +#: src/popthelp.c:186 +msgid "SHORT" +msgstr "SHORT" + +#: src/popthelp.c:187 +msgid "LONG" +msgstr "LONG" + +#: src/popthelp.c:188 +msgid "LONGLONG" +msgstr "LONGLONG" + +#: src/popthelp.c:189 +msgid "STRING" +msgstr "სტრიქონი" + +#: src/popthelp.c:190 +msgid "FLOAT" +msgstr "FLOAT" + +#: src/popthelp.c:191 +msgid "DOUBLE" +msgstr "DOUBLE" + +#: src/popthelp.c:194 +msgid "ARG" +msgstr "ARG" + +#: src/popthelp.c:615 +msgid "Usage:" +msgstr "გამოყენება:" + +#: src/popthelp.c:640 +msgid "[OPTION...]" +msgstr "[პარამეტრი...]" diff --git a/po/ko.po b/po/ko.po index 0743e12..02b1a12 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,66 +1,74 @@ +# simmon , 2021. msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2001-09-06 20:06+0900\n" -"Last-Translator: Jong-Hoon Ryu \n" -"Language-Team: GNU Translation project \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2021-03-17 18:01+0000\n" +"Last-Translator: simmon \n" +"Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 4.5.1\n" #: src/popt.c:46 msgid "unknown errno" msgstr "알 수 없는 오류코드(errno) 입니다" -#: src/popt.c:1206 -#, fuzzy, c-format +#: src/popt.c:1200 +#, c-format msgid "option type (%u) not implemented in popt\n" -msgstr "옵션 유형 (%d)은 popt에서 사용할 수 없습니다\n" +msgstr "옵션 유형 (%u)은 popt에서 사용할 수 없습니다\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "인수가 지정되지 않았습니다" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "알 수 없는 옵션입니다" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "양쪽에 배타적 논리 연산이 지정되었습니다" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "옵션->인수가 NULL이 되어서는 안됩니다" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "별칭(alias)이 복잡하게 설정되었습니다" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "매개변수에 오류가 있습니다" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "잘못된 수치 값입니다" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "숫자가 너무 크거나 너무 적습니다" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "메모리 할당에 실패했습니다" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "설정 파일이 건전성 시험에 실패하였습니다" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "알 수 없는 오류입니다" @@ -78,15 +86,15 @@ msgstr "기본적인 옵션을 보여줍니다" #: src/popthelp.c:78 msgid "Terminate options" -msgstr "" +msgstr "종료 선택" #: src/popthelp.c:170 msgid "Help options:" -msgstr "" +msgstr "도움말 선택:" #: src/popthelp.c:171 msgid "Options implemented via popt alias/exec:" -msgstr "" +msgstr "popt alias/exec 통해 구현된 선택:" #: src/popthelp.c:179 msgid "NONE" @@ -102,16 +110,15 @@ msgstr "정수(INT)" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "짧은" #: src/popthelp.c:187 msgid "LONG" msgstr "정수(LONG)" #: src/popthelp.c:188 -#, fuzzy msgid "LONGLONG" -msgstr "정수(LONG)" +msgstr "LONGLONG" #: src/popthelp.c:189 msgid "STRING" @@ -129,10 +136,10 @@ msgstr "소수(DOUBLE)" msgid "ARG" msgstr "인수(ARG)" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "사용법:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[옵션...]" diff --git a/po/lv.po b/po/lv.po index 0261d3d..9ff2586 100644 --- a/po/lv.po +++ b/po/lv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: popt-1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2009-04-12 16:34+0300\n" "Last-Translator: Rihards Prieditis \n" "Language-Team: Latvian \n" @@ -24,52 +24,56 @@ msgstr "" msgid "unknown errno" msgstr "nezināms kļūdas numurs" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "iespējas tips (%u) nav ieviests popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "trūkst arguments" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "nezināma iespēja" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "pieprasītas savstarpējie izslēdzošas loģiskās operācijas" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opcija->arguments nevar būt NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "aizstājvārdi iegulti pārāk dziļi" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "kļuda parametru citēšanā" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "nederīga skaitļa vērtība" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "skaitlis pārāk liels, vai pārāk mazs" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "atmiņas iedalīšana neizdevās" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "nezināma kļūda" @@ -137,10 +141,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARGUMENTS" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Lietošana:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[IESPĒJAS..]" diff --git a/po/nb.po b/po/nb.po index d02fc87..e0fe37b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2001-06-27 11:05+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -15,52 +15,56 @@ msgstr "" msgid "unknown errno" msgstr "ukjent errno" -#: src/popt.c:1206 +#: src/popt.c:1200 #, fuzzy, c-format msgid "option type (%u) not implemented in popt\n" msgstr "flaggtype (%d) ikke implementert i popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "manglende argument" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "ukjent flagg" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "gjensidig eksluderende logiske operasjoner forespurt" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg må ikke være NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "aliaser med for dype løkker" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "feil i parametersitering" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "ugyldig numerisk verdi" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "tallet er for stort eller lite" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "minneallokering feilet" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "ukjent feil" @@ -129,10 +133,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Bruk:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[FLAGG...]" diff --git a/po/nl.po b/po/nl.po index 3365a1d..2c9270a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,71 +1,78 @@ # Dutch messages for popt. # This file is put in the public domain. # Tim Van Holder , 2007, 2008. -# +# Geert Warrink , 2020. msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2008-02-20 19:26+0100\n" -"Last-Translator: Tim Van Holder \n" -"Language-Team: Dutch \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2020-10-02 12:30+0000\n" +"Last-Translator: Geert Warrink \n" +"Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.2.2\n" #: src/popt.c:46 msgid "unknown errno" msgstr "onbekend foutnummer (errno)" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "dit optietype (%u) is niet geïmplementeerd in popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "ontbrekend argument" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "onbekende optie" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "elkaar uitsluitende logische operatoren werden gevraagd" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg zou niet NULL mogen zijn" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "aliassen zijn te diep genest" # of toch beter "quoting" behouden? -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "fout in de aanhaling van parameters" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "ongeldige numerieke waarde" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "getal is te klein of te groot" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "reserveren van geheugen is mislukt" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "configuratie bestand faalde voor de gezond verstand test" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "onbekende fout" @@ -108,7 +115,7 @@ msgstr "INT" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "KORT" #: src/popthelp.c:187 msgid "LONG" @@ -136,10 +143,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Gebruik:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[OPTIE...]" diff --git a/po/pl.po b/po/pl.po index bf80048..1cfe191 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,84 +1,92 @@ # Polish translation for popt. # This file is distributed under the same license as the popt package. # Jakub Bogusz , 2002-2008. -# +# Piotr Drąg , 2020. msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2008-02-18 00:30+0100\n" -"Last-Translator: Jakub Bogusz \n" -"Language-Team: Polish \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2020-08-22 11:25+0000\n" +"Last-Translator: Piotr Drąg \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.2.1\n" #: src/popt.c:46 msgid "unknown errno" msgstr "nieznane errno" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" -msgstr "typ opcji (%u) nie zaimplementowany w popt\n" +msgstr "typ opcji (%u) nie jest zaimplementowany w popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "brak parametru" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "nieznana opcja" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" -msgstr "żądanie wykluczających się operacji" +msgstr "zażądano wzajemnie wykluczających się działań logicznych" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg nie może być NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" -msgstr "zbyt duże zagłębienie aliasów" +msgstr "za duże zagłębienie aliasów" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" -msgstr "błąd w cytowaniu parametru" +msgstr "błąd w cytowaniu parametru" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" -msgstr "błędna wartość liczbowa" +msgstr "nieprawidłowa wartość liczbowa" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" -msgstr "liczba zbyt duża lub zbyt mała" +msgstr "liczba jest za duża lub za mała" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" -msgstr "błąd alokacji pamięci" +msgstr "przydzielenie pamięci się nie powiodło" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "test poprawności pliku konfiguracji się nie powiódł" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "nieznany błąd" #: src/popthelp.c:64 src/popthelp.c:72 msgid "Show this help message" -msgstr "Pokaż tę pomoc" +msgstr "Wyświetla ten komunikat pomocy" #: src/popthelp.c:65 src/popthelp.c:73 msgid "Display brief usage message" -msgstr "Wyświetl skrócony sposób użycia" +msgstr "Wyświetla skrócony sposób użycia" #: src/popthelp.c:76 msgid "Display option defaults in message" -msgstr "Wyświetl domyślne opcje w opisie" +msgstr "Wyświetla domyślne opcje w komunikacie" #: src/popthelp.c:78 msgid "Terminate options" @@ -90,7 +98,7 @@ msgstr "Opcje pomocy:" #: src/popthelp.c:171 msgid "Options implemented via popt alias/exec:" -msgstr "Opcje zaimplementowane poprzez popt alias/exec:" +msgstr "Opcje zaimplementowane przez alias/exec popt:" #: src/popthelp.c:179 msgid "NONE" @@ -106,7 +114,7 @@ msgstr "INT" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "SHORT" #: src/popthelp.c:187 msgid "LONG" @@ -118,7 +126,7 @@ msgstr "LONGLONG" #: src/popthelp.c:189 msgid "STRING" -msgstr "ŁAŃCUCH" +msgstr "CIĄG" #: src/popthelp.c:190 msgid "FLOAT" @@ -132,10 +140,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "PARAM" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" -msgstr "Składnia:" +msgstr "Użycie:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" -msgstr "[OPCJA...]" +msgstr "[OPCJA…]" diff --git a/po/popt.pot b/po/popt.pot index 1b2b5d7..bfb369f 100644 --- a/po/popt.pot +++ b/po/popt.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: popt 1.18\n" +"Project-Id-Version: popt 1.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,52 +20,56 @@ msgstr "" msgid "unknown errno" msgstr "" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "" @@ -133,10 +137,10 @@ msgstr "" msgid "ARG" msgstr "" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "" diff --git a/po/pt.po b/po/pt.po index 236ecd5..b71d229 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,80 +1,88 @@ +# Gustavo Costa , 2021. msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2002-02-13 18:32+0000\n" -"Last-Translator: Pedro Morais \n" -"Language-Team: pt \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2021-05-13 16:02+0000\n" +"Last-Translator: Gustavo Costa \n" +"Language-Team: Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.6.2\n" #: src/popt.c:46 msgid "unknown errno" msgstr "errno desconhecido" -#: src/popt.c:1206 -#, fuzzy, c-format +#: src/popt.c:1200 +#, c-format msgid "option type (%u) not implemented in popt\n" -msgstr "tipo de opção (%d) não implementado no popt\n" +msgstr "tipo de opção (%u) não implementado no popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "falta um argumento" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "opção desconhecida" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "foram pedidas operações lógicas mutuamente exclusivas" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg não deve ser NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "'aliases' demasiado aninhados" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "erros no 'quoting' de parâmetros" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "valor númerico inválido" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "número demasiado grando ou pequeno" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "alocação de memória falhou" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "erro desconhecido" #: src/popthelp.c:64 src/popthelp.c:72 msgid "Show this help message" -msgstr "Mostrar esta mensagem de ajuda" +msgstr "Mostra esta mensagem de ajuda" #: src/popthelp.c:65 src/popthelp.c:73 msgid "Display brief usage message" -msgstr "Mostrar uma mensagem de utilização sucinta" +msgstr "Mostra uma mensagem de utilização sucinta" #: src/popthelp.c:76 msgid "Display option defaults in message" -msgstr "Mostrar valor por omissão das opções na mensagem" +msgstr "Mostra valor padrão das opções na mensagem" #: src/popthelp.c:78 msgid "Terminate options" @@ -82,11 +90,11 @@ msgstr "" #: src/popthelp.c:170 msgid "Help options:" -msgstr "" +msgstr "Opções de ajuda:" #: src/popthelp.c:171 msgid "Options implemented via popt alias/exec:" -msgstr "" +msgstr "Opções implementadas via popt alias/exec:" #: src/popthelp.c:179 msgid "NONE" @@ -102,16 +110,15 @@ msgstr "INT" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "SHORT" #: src/popthelp.c:187 msgid "LONG" msgstr "LONG" #: src/popthelp.c:188 -#, fuzzy msgid "LONGLONG" -msgstr "LONG" +msgstr "LONGLONG" #: src/popthelp.c:189 msgid "STRING" @@ -129,10 +136,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Utilização:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[OPÇÃO...]" diff --git a/po/pt_BR.po b/po/pt_BR.po new file mode 100644 index 0000000..fb4d43a --- /dev/null +++ b/po/pt_BR.po @@ -0,0 +1,148 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Gustavo Costa , 2021. +# Rafael Fontenelle , 2021. +msgid "" +msgstr "" +"Project-Id-Version: popt 1.18\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2021-07-10 16:04+0000\n" +"Last-Translator: Rafael Fontenelle \n" +"Language-Team: Portuguese (Brazil) \n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.7.1\n" + +#: src/popt.c:46 +msgid "unknown errno" +msgstr "errno desconhecido" + +#: src/popt.c:1200 +#, c-format +msgid "option type (%u) not implemented in popt\n" +msgstr "tipo de opção (%u) não implementado no popt\n" + +#: src/popt.c:1638 +msgid "missing argument" +msgstr "argumento faltando" + +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 +msgid "unknown option" +msgstr "opção desconhecida" + +#: src/popt.c:1644 +msgid "mutually exclusive logical operations requested" +msgstr "operações lógicas mutuamente exclusivas solicitadas" + +#: src/popt.c:1646 +msgid "opt->arg should not be NULL" +msgstr "opt->arg não deve ser NULL" + +#: src/popt.c:1648 +msgid "aliases nested too deeply" +msgstr "aliases aninhados muito profundamente" + +#: src/popt.c:1650 +msgid "error in parameter quoting" +msgstr "erro ao colocar aspas no parâmetro" + +#: src/popt.c:1652 +msgid "invalid numeric value" +msgstr "valor numérico inválido" + +#: src/popt.c:1654 +msgid "number too large or too small" +msgstr "número muito grande ou muito pequeno" + +#: src/popt.c:1656 +msgid "memory allocation failed" +msgstr "alocação de memória falhou" + +#: src/popt.c:1658 +msgid "config file failed sanity test" +msgstr "arquivo de config falhou no teste de sanidade" + +#: src/popt.c:1662 +msgid "unknown error" +msgstr "erro desconhecido" + +#: src/popthelp.c:64 src/popthelp.c:72 +msgid "Show this help message" +msgstr "Mostra esta mensagem de ajuda" + +#: src/popthelp.c:65 src/popthelp.c:73 +msgid "Display brief usage message" +msgstr "Exibe breve mensagem de uso" + +#: src/popthelp.c:76 +msgid "Display option defaults in message" +msgstr "Exibe opções padrão na mensagem" + +#: src/popthelp.c:78 +msgid "Terminate options" +msgstr "Opções de encerramento" + +#: src/popthelp.c:170 +msgid "Help options:" +msgstr "Opções de ajuda:" + +#: src/popthelp.c:171 +msgid "Options implemented via popt alias/exec:" +msgstr "Opções implementadas via popt alias/exec:" + +#: src/popthelp.c:179 +msgid "NONE" +msgstr "NONE" + +#: src/popthelp.c:181 +msgid "VAL" +msgstr "VAL" + +#: src/popthelp.c:185 +msgid "INT" +msgstr "INT" + +#: src/popthelp.c:186 +msgid "SHORT" +msgstr "SHORT" + +#: src/popthelp.c:187 +msgid "LONG" +msgstr "LONG" + +#: src/popthelp.c:188 +msgid "LONGLONG" +msgstr "LONGLONG" + +#: src/popthelp.c:189 +msgid "STRING" +msgstr "STRING" + +#: src/popthelp.c:190 +msgid "FLOAT" +msgstr "FLOAT" + +#: src/popthelp.c:191 +msgid "DOUBLE" +msgstr "DOUBLE" + +#: src/popthelp.c:194 +msgid "ARG" +msgstr "ARG" + +#: src/popthelp.c:615 +msgid "Usage:" +msgstr "Uso:" + +#: src/popthelp.c:640 +msgid "[OPTION...]" +msgstr "[OPÇÃO...]" diff --git a/po/ro.po b/po/ro.po index 91abdd8..f62cf0d 100644 --- a/po/ro.po +++ b/po/ro.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2000-06-14 23:23+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -15,53 +15,57 @@ msgstr "" msgid "unknown errno" msgstr "eroare necunoscuta" -#: src/popt.c:1206 +#: src/popt.c:1200 #, fuzzy, c-format msgid "option type (%u) not implemented in popt\n" msgstr "optiunea de tipul (%d) nu este implementata in popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "argument lipsa" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "optiune necunoscuta" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "recursivitate infinita la optiunile sinonime" -#: src/popt.c:1635 +#: src/popt.c:1650 #, fuzzy msgid "error in parameter quoting" msgstr "eroare la insertie parametru" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "valoare numarica invalida" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "numar prea mare sau prea mic" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "eroare necuinoscuta" @@ -130,10 +134,10 @@ msgstr "" msgid "ARG" msgstr "" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Sintaxa:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[OPTIUNE...]" diff --git a/po/ru.po b/po/ru.po index a308087..1e4d9c0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2009-02-01 13:30+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -16,59 +16,63 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/popt.c:46 msgid "unknown errno" msgstr "неизвестный errno" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "обработка параметра (%u) в popt не предусмотрена\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "пропущен аргумент" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "неизвестный параметр" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "запрошены взаимно исключающие логические операции" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg не может быть NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "превышен уровень допустимой рекурсии подстановок" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "ошибка помещения параметров в кавычки" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "неправильное числовое значение" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "числовое значение за пределами предусмотренного" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "не удалось выделить память" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "неизвестная ошибка" @@ -136,10 +140,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Использование:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[ПАРАМЕТР...]" diff --git a/po/si.po b/po/si.po new file mode 100644 index 0000000..8843845 --- /dev/null +++ b/po/si.po @@ -0,0 +1,147 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Hela Basa , 2021. +msgid "" +msgstr "" +"Project-Id-Version: popt 1.18\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2021-08-19 08:04+0000\n" +"Last-Translator: Hela Basa \n" +"Language-Team: Sinhala \n" +"Language: si\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.7.2\n" + +#: src/popt.c:46 +msgid "unknown errno" +msgstr "" + +#: src/popt.c:1200 +#, c-format +msgid "option type (%u) not implemented in popt\n" +msgstr "" + +#: src/popt.c:1638 +msgid "missing argument" +msgstr "" + +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 +msgid "unknown option" +msgstr "" + +#: src/popt.c:1644 +msgid "mutually exclusive logical operations requested" +msgstr "" + +#: src/popt.c:1646 +msgid "opt->arg should not be NULL" +msgstr "" + +#: src/popt.c:1648 +msgid "aliases nested too deeply" +msgstr "" + +#: src/popt.c:1650 +msgid "error in parameter quoting" +msgstr "" + +#: src/popt.c:1652 +msgid "invalid numeric value" +msgstr "" + +#: src/popt.c:1654 +msgid "number too large or too small" +msgstr "" + +#: src/popt.c:1656 +msgid "memory allocation failed" +msgstr "" + +#: src/popt.c:1658 +msgid "config file failed sanity test" +msgstr "" + +#: src/popt.c:1662 +msgid "unknown error" +msgstr "" + +#: src/popthelp.c:64 src/popthelp.c:72 +msgid "Show this help message" +msgstr "" + +#: src/popthelp.c:65 src/popthelp.c:73 +msgid "Display brief usage message" +msgstr "" + +#: src/popthelp.c:76 +msgid "Display option defaults in message" +msgstr "" + +#: src/popthelp.c:78 +msgid "Terminate options" +msgstr "" + +#: src/popthelp.c:170 +msgid "Help options:" +msgstr "" + +#: src/popthelp.c:171 +msgid "Options implemented via popt alias/exec:" +msgstr "" + +#: src/popthelp.c:179 +msgid "NONE" +msgstr "" + +#: src/popthelp.c:181 +msgid "VAL" +msgstr "" + +#: src/popthelp.c:185 +msgid "INT" +msgstr "" + +#: src/popthelp.c:186 +msgid "SHORT" +msgstr "" + +#: src/popthelp.c:187 +msgid "LONG" +msgstr "" + +#: src/popthelp.c:188 +msgid "LONGLONG" +msgstr "" + +#: src/popthelp.c:189 +msgid "STRING" +msgstr "" + +#: src/popthelp.c:190 +msgid "FLOAT" +msgstr "" + +#: src/popthelp.c:191 +msgid "DOUBLE" +msgstr "" + +#: src/popthelp.c:194 +msgid "ARG" +msgstr "" + +#: src/popthelp.c:615 +msgid "Usage:" +msgstr "භාවිතය:" + +#: src/popthelp.c:640 +msgid "[OPTION...]" +msgstr "" diff --git a/po/sk.po b/po/sk.po index 412344c..c509610 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 1999-08-04 21:40+0200\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -19,52 +19,56 @@ msgstr "" msgid "unknown errno" msgstr "" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "" @@ -133,10 +137,10 @@ msgstr "" msgid "ARG" msgstr "" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "" diff --git a/po/sl.po b/po/sl.po index ff8ca5a..8c97b61 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2000-09-05 12:30+0200\n" "Last-Translator: Roman Maurer \n" "Language-Team: Slovenian \n" @@ -15,52 +15,56 @@ msgstr "" msgid "unknown errno" msgstr "" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "" @@ -129,10 +133,10 @@ msgstr "" msgid "ARG" msgstr "" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "" diff --git a/po/sv.po b/po/sv.po index b5ec824..8abcd15 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # Swedish messages for popt. # Copyright © 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the popt package. -# Göran Uddeborg , 2008. +# Göran Uddeborg , 2008, 2020. # # $Revision: 1.4 $ # @@ -9,65 +9,72 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2008-02-23 20:15+0100\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2020-08-23 18:29+0000\n" "Last-Translator: Göran Uddeborg \n" -"Language-Team: Swedish \n" +"Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.2.1\n" #: src/popt.c:46 msgid "unknown errno" msgstr "okänt felnummer" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "flaggtypen (%u) är inte implementerad i popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "argument saknas" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "okänd flagga" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "ömsesidigt uteslutande logiska operationer begärdes" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg får inte vara NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "alias är nästade för djupt" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "fel i parametercitering" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "ogiltigt numeriskt värde" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "talet för stort eller för litet" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "minnesallokering misslyckades" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "konfigurationsfilen klarade inte rimlighetskontrollen" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "okänt fel" @@ -109,7 +116,7 @@ msgstr "HELTAL" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "KORT" #: src/popthelp.c:187 msgid "LONG" @@ -135,10 +142,10 @@ msgstr "DUBBEL" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Användning:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[FLAGGA...]" diff --git a/po/th.po b/po/th.po index 4a1433d..dd79bb2 100644 --- a/po/th.po +++ b/po/th.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2008-02-19 15:53+0700\n" "Last-Translator: Seksan Poltree \n" "Language-Team: Thai \n" @@ -21,52 +21,56 @@ msgstr "" msgid "unknown errno" msgstr "เกิด errno ที่ไม่รู้จัก" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "ตัวเลือกชนิด (%u) ไม่ถูกอิมพลีเมนต์ใน popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "ไม่พบอาร์กิวเมนต์" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "ไม่รู้จักตัวเลือก" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "เกิดการร้องขอร่วมกันของการดำเนินการด้านตรรกะอย่างเดียวกัน" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg ไม่ควรจะเป็น NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "นามแฝงซ้อนกันมากเกินไป" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "เกิดข้อผิดพลาดในการอ้างอิงพารามิเตอร์" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "ค่าตัวเลขผิดพลาด" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "ตัวเลขมีค่ามากหรือน้อยเกินไป" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "การจัดสรรหน่วยความจำผิดพลาด" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "ความผิดพลาดที่ไม่รู้จัก" @@ -134,10 +138,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "วิธีใช้:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[ตัวเลือก...]" diff --git a/po/tr.po b/po/tr.po index f3b0ec6..3142fe4 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,96 +1,102 @@ # Translation of popt to Turkish. # Nilgun Belma Buguner , 2000. -# +# Oğuz Ersen , 2020. msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2000-02-11 13:01+0200\n" -"Last-Translator: Nilgun Belma Buguner \n" -"Language-Team: Turkish \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2020-09-03 12:31+0000\n" +"Last-Translator: Oğuz Ersen \n" +"Language-Team: Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.2.2\n" #: src/popt.c:46 msgid "unknown errno" -msgstr "bilinmeyen hata no" +msgstr "bilinmeyen hata numarası (errno)" -#: src/popt.c:1206 -#, fuzzy, c-format +#: src/popt.c:1200 +#, c-format msgid "option type (%u) not implemented in popt\n" -msgstr "seçenek tĂźrĂź (%d) popt için geçersiz\n" +msgstr "seçenek türü (%u) popt'ta uygulanmadı\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" -msgstr "argĂźman eksik" +msgstr "argüman eksik" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" -msgstr "bilinmeyen seçenek" +msgstr "bilinmeyen seçenek" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" -msgstr "birbirini dışlayan mantÄąksal işlemler istendi" +msgstr "birbirini dışlayan mantıksal işlemler istendi" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" -msgstr "" +msgstr "opt->arg NULL olmamalı" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" -msgstr "adlarda çok fazla içiçelikler" +msgstr "takma adlar çok fazla iç içe geçmiş" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" -msgstr "parametrelerde tÄąrnak işaretleme hatalÄą " +msgstr "parametre tırnak işaretleme hatası" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" -msgstr "sayÄąsal değer geçersiz" +msgstr "sayısal değer geçersiz" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" -msgstr "sayÄą ya çok bĂźyĂźk ya da çok kßçßk" +msgstr "sayı çok büyük veya çok küçük" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" -msgstr "" +msgstr "bellek ayırma başarısız" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "yapılandırma dosyası doğruluk testi başarısız" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "bilinmeyen hata" #: src/popthelp.c:64 src/popthelp.c:72 msgid "Show this help message" -msgstr "Bu yardÄąm iletisini gĂśsterir" +msgstr "Bu yardım mesajını göster" #: src/popthelp.c:65 src/popthelp.c:73 msgid "Display brief usage message" -msgstr "KÄąsa bir kullanÄąm iletisi gĂśster" +msgstr "Kısa bir kullanım mesajı göster" #: src/popthelp.c:76 -#, fuzzy msgid "Display option defaults in message" -msgstr "KÄąsa bir kullanÄąm iletisi gĂśster" +msgstr "Mesajda öntanımlı seçenekleri göster" #: src/popthelp.c:78 msgid "Terminate options" -msgstr "" +msgstr "Seçenekleri sonlandır" #: src/popthelp.c:170 msgid "Help options:" -msgstr "" +msgstr "Yardım seçenekleri:" #: src/popthelp.c:171 msgid "Options implemented via popt alias/exec:" -msgstr "" +msgstr "popt alias/exec aracılığıyla uygulanan seçenekler:" #: src/popthelp.c:179 msgid "NONE" @@ -98,7 +104,7 @@ msgstr "YOK" #: src/popthelp.c:181 msgid "VAL" -msgstr "DEĞ" +msgstr "DEĞER" #: src/popthelp.c:185 msgid "INT" @@ -106,16 +112,15 @@ msgstr "INT" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "SHORT" #: src/popthelp.c:187 msgid "LONG" msgstr "LONG" #: src/popthelp.c:188 -#, fuzzy msgid "LONGLONG" -msgstr "LONG" +msgstr "LONGLONG" #: src/popthelp.c:189 msgid "STRING" @@ -133,10 +138,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" -msgstr "KullanÄąmÄą:" +msgstr "Kullanım:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" -msgstr "[SEÇENEK...]" +msgstr "[SEÇENEK...]" diff --git a/po/uk.po b/po/uk.po index 3469eae..6ea2c4e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,72 +1,80 @@ # Translation into the ukrainian language. # Copyright (C) 1999 Free Software Foundation, Inc. # Yuri Syrota , 1999. -# +# Yuri Chornoivan , 2020. msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 1999-09-30 16:54+0200\n" -"Last-Translator: Yuri Syrota \n" -"Language-Team: Ukrainian \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2020-08-23 18:29+0000\n" +"Last-Translator: Yuri Chornoivan \n" +"Language-Team: Ukrainian \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.2.1\n" #: src/popt.c:46 msgid "unknown errno" -msgstr "" +msgstr "невідомий номер помилки" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" -msgstr "" +msgstr "тип параметра (%u) у popt не реалізовано\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" +msgstr "не вистачає аргументу" + +#: src/popt.c:1640 +msgid "option does not take an argument" msgstr "" -#: src/popt.c:1627 +#: src/popt.c:1642 msgid "unknown option" -msgstr "" +msgstr "невідомий параметр" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" -msgstr "" +msgstr "надійшов запит на взаємно виключні логічні операції" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" -msgstr "" +msgstr "параметр->аргумент повинне не дорівнювати NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" -msgstr "" +msgstr "надто великий рівень вкладеності у альтернативних назвах" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" -msgstr "" +msgstr "помилка у використанні лапок у параметрі" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" -msgstr "" +msgstr "некоректне значення символічного посилання" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" -msgstr "" +msgstr "число є надто великим або надто малим" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" -msgstr "" +msgstr "не вдалося отримати місце у пам'яті" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "файл налаштувань не пройшов перевірку на чинність" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" -msgstr "" +msgstr "невідома помилка" #: src/popthelp.c:64 src/popthelp.c:72 msgid "Show this help message" @@ -77,66 +85,65 @@ msgid "Display brief usage message" msgstr "Показати коротку довідку про використання" #: src/popthelp.c:76 -#, fuzzy msgid "Display option defaults in message" -msgstr "Показати коротку довідку про використання" +msgstr "Показати типові значення параметрів у повідомленні" #: src/popthelp.c:78 msgid "Terminate options" -msgstr "" +msgstr "Завершити параметри" #: src/popthelp.c:170 msgid "Help options:" -msgstr "" +msgstr "Пункти довідки:" #: src/popthelp.c:171 msgid "Options implemented via popt alias/exec:" -msgstr "" +msgstr "Параметри, реалізовані за допомогою alias/exec popt:" #: src/popthelp.c:179 msgid "NONE" -msgstr "" +msgstr "НІЧОГО" #: src/popthelp.c:181 msgid "VAL" -msgstr "" +msgstr "ЗНАЧЕННЯ" #: src/popthelp.c:185 msgid "INT" -msgstr "" +msgstr "INT" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "SHORT" #: src/popthelp.c:187 msgid "LONG" -msgstr "" +msgstr "LONG" #: src/popthelp.c:188 msgid "LONGLONG" -msgstr "" +msgstr "LONGLONG" #: src/popthelp.c:189 msgid "STRING" -msgstr "" +msgstr "РЯДОК" #: src/popthelp.c:190 msgid "FLOAT" -msgstr "" +msgstr "FLOAT" #: src/popthelp.c:191 msgid "DOUBLE" -msgstr "" +msgstr "DOUBLE" #: src/popthelp.c:194 msgid "ARG" -msgstr "" +msgstr "АРГ" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" -msgstr "" +msgstr "Користування:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" -msgstr "" +msgstr "[ПАРАМЕТР...]" diff --git a/po/vi.po b/po/vi.po index 6f32a47..66df4f9 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2008-02-18 16:20+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -22,52 +22,56 @@ msgstr "" msgid "unknown errno" msgstr "số hiệu lỗi không rõ" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "kiểu tùy chọn (%u) chưa được thực hiện trong popt\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "thiếu đối số" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "tùy chọn không rõ" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "« tùy chọn->đối số » không thể vô giá trị" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "các bí danh lồng nhau quá sâu" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "gặp lỗi trong lời trích dẫn tham số" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "giá trị thuộc số không hợp lệ" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "con số quá lớn hay quá nhỏ" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "lỗi cấp phát bộ nhớ" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "lỗi không rõ" @@ -135,10 +139,10 @@ msgstr "ĐÔI" msgid "ARG" msgstr "ĐỐI SỐ" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "Sử dụng:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[TÙY_CHỌN...]" diff --git a/po/wa.po b/po/wa.po index 4513dc7..6a81873 100644 --- a/po/wa.po +++ b/po/wa.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 1999-03-18 23:11+0100\n" "Last-Translator: Nobody yet\n" "Language-Team: walon \n" @@ -23,52 +23,56 @@ msgstr "" msgid "unknown errno" msgstr "" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "" @@ -137,10 +141,10 @@ msgstr "" msgid "ARG" msgstr "" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9ac3851..df66582 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,72 +1,79 @@ -# translation of translation.po to +# translation of translation.po to # Simplified Chinese Messages for popt # Copyright (C) 2005, 2007 Free Software Foundation, Inc. # Wei-Lun Chao , 2005. # LI Daobing , 2007, 2008. -# +# Charles Lee , 2020. msgid "" msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" -"PO-Revision-Date: 2008-02-18 20:16+0800\n" -"Last-Translator: LI Daobing \n" -"Language-Team: Chinese (simplified) \n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" +"PO-Revision-Date: 2020-10-09 08:30+0000\n" +"Last-Translator: Charles Lee \n" +"Language-Team: Chinese (Simplified) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 4.2.2\n" #: src/popt.c:46 msgid "unknown errno" msgstr "未知的错误" -#: src/popt.c:1206 +#: src/popt.c:1200 #, c-format msgid "option type (%u) not implemented in popt\n" msgstr "选项类别 (%u) 没有在 popt 中实现\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "缺少参数" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "未知的选项" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "需要 XOR 逻辑运算" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg 不应该为 NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "别名嵌套太深" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "参数引号错误" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "无效的数值" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "数值太大或太小" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "内存分配错误" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" -msgstr "" +msgstr "配置文件健全性测试失败" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "未知的错误" @@ -108,7 +115,7 @@ msgstr "INT" #: src/popthelp.c:186 msgid "SHORT" -msgstr "" +msgstr "SHORT" #: src/popthelp.c:187 msgid "LONG" @@ -134,10 +141,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "用法:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[选项...]" diff --git a/po/zh_TW.po b/po/zh_TW.po index dee594f..f1745e1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-23 13:29+0300\n" +"POT-Creation-Date: 2022-09-16 10:04+0300\n" "PO-Revision-Date: 2005-04-08 17:52+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: zh_TW \n" @@ -19,52 +19,56 @@ msgstr "" msgid "unknown errno" msgstr "未知的錯誤" -#: src/popt.c:1206 +#: src/popt.c:1200 #, fuzzy, c-format msgid "option type (%u) not implemented in popt\n" msgstr "選項類型 (%d) 沒有在 popt 中實作\n" -#: src/popt.c:1625 +#: src/popt.c:1638 msgid "missing argument" msgstr "缺少引數" -#: src/popt.c:1627 +#: src/popt.c:1640 +msgid "option does not take an argument" +msgstr "" + +#: src/popt.c:1642 msgid "unknown option" msgstr "未知的選項" -#: src/popt.c:1629 +#: src/popt.c:1644 msgid "mutually exclusive logical operations requested" msgstr "需要相互獨立的邏輯運算" -#: src/popt.c:1631 +#: src/popt.c:1646 msgid "opt->arg should not be NULL" msgstr "opt->arg 不應為 NULL" -#: src/popt.c:1633 +#: src/popt.c:1648 msgid "aliases nested too deeply" msgstr "巢狀別名太深" -#: src/popt.c:1635 +#: src/popt.c:1650 msgid "error in parameter quoting" msgstr "參數引號錯誤" -#: src/popt.c:1637 +#: src/popt.c:1652 msgid "invalid numeric value" msgstr "不正確的數值" -#: src/popt.c:1639 +#: src/popt.c:1654 msgid "number too large or too small" msgstr "數字太大或太小" -#: src/popt.c:1641 +#: src/popt.c:1656 msgid "memory allocation failed" msgstr "記憶體配置錯誤" -#: src/popt.c:1643 +#: src/popt.c:1658 msgid "config file failed sanity test" msgstr "" -#: src/popt.c:1647 +#: src/popt.c:1662 msgid "unknown error" msgstr "未知的錯誤" @@ -133,10 +137,10 @@ msgstr "DOUBLE" msgid "ARG" msgstr "ARG" -#: src/popthelp.c:616 +#: src/popthelp.c:615 msgid "Usage:" msgstr "用法:" -#: src/popthelp.c:638 +#: src/popthelp.c:640 msgid "[OPTION...]" msgstr "[選項...]" diff --git a/popt.3 b/popt.3 index 2293481..a98b491 100644 --- a/popt.3 +++ b/popt.3 @@ -8,7 +8,7 @@ popt \- Parse command line options .BI "poptContext poptGetContext(const char * " name ", int " argc , .BI " const char ** "argv , .BI " const struct poptOption * " options , -.BI " int " flags ); +.BI " unsigned int " flags ); .sp .BI "void poptFreeContext(poptContext " con ); .sp @@ -95,13 +95,13 @@ structures: .sp .nf struct poptOption { - const char * longName; /* may be NULL */ - char shortName; /* may be '\\0' */ - int argInfo; - void * arg; /* depends on argInfo */ - int val; /* 0 means don't return, just update flag */ - char * descrip; /* description for autohelp -- may be NULL */ - char * argDescrip; /* argument description for autohelp */ + const char * longName; /* may be NULL */ + char shortName; /* may be '\\0' */ + unsigned int argInfo; /* type of argument expected after the option */ + void * arg; /* depends on argInfo */ + int val; /* 0 means don't return, just update arg */ + const char * descrip; /* description for autohelp -- may be NULL */ + const char * argDescrip; /* argument description for autohelp -- may be NULL*/ }; .fi .sp @@ -117,7 +117,9 @@ The after the option. If no argument is expected, .B POPT_ARG_NONE should be used. -The rest of the valid values are shown in the following table: +The valid values of +.IR argInfo +are shown in the following table: .sp .TS lfB lfB lfB @@ -126,12 +128,12 @@ Value Description arg Type POPT_ARG_NONE No argument expected int POPT_ARG_STRING No type checking to be performed char * POPT_ARG_ARGV No type checking to be performed char ** -POPT_ARG_SHORT An short argument is expected short +POPT_ARG_SHORT A short argument is expected short POPT_ARG_INT An integer argument is expected int POPT_ARG_LONG A long integer is expected long POPT_ARG_LONGLONG A long long integer is expected long long POPT_ARG_VAL Integer value taken from \f(CWval\fR int -POPT_ARG_FLOAT An float argument is expected float +POPT_ARG_FLOAT A float argument is expected float POPT_ARG_DOUBLE A double argument is expected double .TE .sp @@ -191,7 +193,7 @@ command-line argument. .RI "The last two options, " descrip " and " argDescrip " are only required if automatic help messages are desired (automatic usage messages can .RI "be generated without them). " descrip " is a text description of the -.RI "argument and " argdescrip " is a short summary of the type of arguments +.RI "argument and " argDescrip " is a short summary of the type of arguments .RI "the option expects, or NULL if the option doesn't require any arguments. .sp @@ -230,7 +232,7 @@ in graphical programming toolkits, for example). To do this, set the \fIargInfo\fR field to \fBPOPT_ARG_INCLUDE_TABLE\fR and the \fRarg\fR field to point to the table which is being included. If automatic help generation is being used, the \fIdescrip\fR field should -contain a overall description of the option table being included. +contain an overall description of the option table being included. .sp The other special option table entry type tells popt to call a function (a callback) when any option in that table is found. This is especially useful @@ -274,7 +276,7 @@ modified outside the popt library. .BI "poptContext poptGetContext(const char * " name ", int "argc ", .BI " const char ** "argv ", .BI " const struct poptOption * "options ", -.BI " int "flags ");" +.BI " unsigned int "flags ");" .fi .sp The first parameter, @@ -287,7 +289,7 @@ two arguments specify the command-line arguments to parse. These are .IR options " parameter points to the table of command-line options, " which was described in the previous section. The final parameter, .IR flags , -can take one of three values: +can be any bitwise or combination of the following four values: .br .TS lfB lfB @@ -296,6 +298,7 @@ Value Description POPT_CONTEXT_NO_EXEC Ignore exec expansions POPT_CONTEXT_KEEP_FIRST Do not ignore argv[0] POPT_CONTEXT_POSIXMEHARDER Options cannot follow arguments +POPT_CONTEXT_ARG_OPTS Return the arguments as options of value 0 .TE .sp .RB "A " poptContext " keeps track of which options have already been " @@ -435,15 +438,23 @@ All of the popt functions that can return errors return integers. When an error occurs, a negative error code is returned. The following table summarizes the error codes that occur: .sp -.nf -.B " Error Description" -.BR "POPT_ERROR_NOARG " "Argument missing for an option." -.BR "POPT_ERROR_BADOPT " "Option's argument couldn't be parsed." -.BR "POPT_ERROR_OPTSTOODEEP " "Option aliasing nested too deeply." -.BR "POPT_ERROR_BADQUOTE " "Quotations do not match." -.BR "POPT_ERROR_BADNUMBER " "Option couldn't be converted to number." -.BR "POPT_ERROR_OVERFLOW " "A given number was too big or small." -.fi +.TS +lfB lfB +lfB lfR. +Error Description +POPT_ERROR_NOARG Argument missing for an option. +POPT_ERROR_BADOPT Option's argument couldn't be parsed. +POPT_ERROR_UNWANTEDARG Option does not take an argument. +POPT_ERROR_OPTSTOODEEP Option aliasing nested too deeply. +POPT_ERROR_BADQUOTE Quotations do not match. +POPT_ERROR_ERRNO errno set, use strerror(errno). +POPT_ERROR_BADNUMBER Option couldn't be converted to number. +POPT_ERROR_OVERFLOW A given number was too big or small. +POPT_ERROR_BADOPERATION Mutually exclusive logical operations requested. +POPT_ERROR_NULLARG opt->arg should not be NULL. +POPT_ERROR_MALLOC Memory allocation failed. +POPT_ERROR_BADCONFIG Config file failed sanity test. +.TE .sp Here is a more detailed discussion of each error: .sp @@ -460,9 +471,12 @@ line, but no argument was given. This can be returned only by .sp .TP .B POPT_ERROR_OPTSTOODEEP -A set of option aliases is nested too deeply. Currently, popt -follows options only 10 levels to prevent infinite recursion. Only -.BR poptGetNextOpt() " can return this error." +A set of option aliases is nested too deeply. Currently, popt +follows options only 10 levels +.B (POPT_OPTION_DEPTH) +to prevent infinite recursion. Only +.B poptGetNextOpt() +can return this error. .sp .TP .B POPT_ERROR_BADQUOTE @@ -471,12 +485,19 @@ A parsed string has a quotation mismatch (such as a single quotation .BR poptReadDefaultConfig() " can return this error." .sp .TP +.B POPT_ERROR_ERRNO +.RI "A system call returned with an error, and " errno " still +contains the error from the system call. Both +.BR poptReadConfigFile() " and " poptReadDefaultConfig() " can " +return this error. +.sp +.TP .B POPT_ERROR_BADNUMBER A conversion from a string to a number (int or long) failed due to the string containing non-numeric characters. This occurs when .BR poptGetNextOpt() " is processing an argument of type " .BR POPT_ARG_INT ", " POPT_ARG_SHORT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", " -.RB POPT_ARG_FLOAT ", or " POPT_ARG_DOUBLE "." +.BR POPT_ARG_FLOAT ", or " POPT_ARG_DOUBLE "." .sp .TP .B POPT_ERROR_OVERFLOW @@ -484,14 +505,51 @@ A string-to-number conversion failed because the number was too .RB "large or too small. Like " POPT_ERROR_BADNUMBER ", this error .RB "can occur only when " poptGetNextOpt() " is processing an " .RB "argument of type " POPT_ARG_INT ", " POPT_ARG_SHORT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", " -.RB POPT_ARG_FLOAT ", or " POPT_ARG_DOUBLE "." +.BR POPT_ARG_FLOAT ", or " POPT_ARG_DOUBLE "." .sp .TP -.B POPT_ERROR_ERRNO -.RI "A system call returned with an error, and " errno " still -contains the error from the system call. Both -.BR poptReadConfigFile() " and " poptReadDefaultConfig() " can " -return this error. +.B POPT_ERROR_BADOPERATION +More than one logical operation (AND, OR, XOR) was specified for an option, or +.B POPT_ARGFLAG_RANDOM +was specified but the platform does not support the +.B random() +function. This can be returned only by +.BR poptSaveLongLong() ", " poptSaveLong() ", " poptSaveInt() ", " +.BR poptSaveShort() " and " poptGetNextOpt() "." +.sp +.TP +.B POPT_ERROR_NULLARG +An operation was invoked on a null target +.I arg +(including zero-length string arguments). In the +.B poptBitsArgs() +case, this includes an empty leftover +.I argv +array. This can only be returned by the +.B poptBits*() +and +.B poptSave*() +functions, +.B poptConfigFileToString() +and +.BR poptGetNextOpt() . +.sp +.TP +.B POPT_ERROR_MALLOC +Memory allocation failed. This can only be returned by +.BR poptReadFile() , +.BR poptDupArgv() , +.BR poptParseArgvString() , +.B poptConfigFileToString() +and +.BR poptGetNextOpt() . +.sp +.TP +.B POPT_ERROR_BADCONFIG +The popt configuration files are corrupted. This can only be returned by +.B poptReadConfigFile() +and +.BR poptReadConfigFiles() . .sp .PP Two functions are available to make it easy for applications to provide @@ -657,21 +715,22 @@ at least some of the features of the extremely rich popt library. .nf #include #include +#include void usage(poptContext optCon, int exitcode, char *error, char *addl) { poptPrintUsage(optCon, stderr, 0); - if (error) fprintf(stderr, "%s: %s\n", error, addl); + if (error) fprintf(stderr, "%s: %s\\n", error, addl); exit(exitcode); } int main(int argc, char *argv[]) { - char c; /* used for argument parsing */ + int c; /* used for argument parsing */ int i = 0; /* used for tracking options */ - char *portname; int speed = 0; /* used in argument parsing to set speed */ int raw = 0; /* raw mode? */ int j; char buf[BUFSIZ+1]; + const char *portname; poptContext optCon; /* context for parsing command-line options */ struct poptOption optionsTable[] = { diff --git a/popt.pc.in b/popt.pc.in index 43c1735..315caf0 100644 --- a/popt.pc.in +++ b/popt.pc.in @@ -7,4 +7,5 @@ Name: popt Version: @VERSION@ Description: popt library. Libs: -L${libdir} -lpopt +Libs.private: @LTLIBICONV@ Cflags: -I${includedir} diff --git a/src/Makefile.am b/src/Makefile.am index c9e052a..c7bf578 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ # libtool current:revision:age info -libpopt_la_LDFLAGS += -version-info 0:1:0 +libpopt_la_LDFLAGS += -version-info 0:2:0 if HAVE_LD_VERSION_SCRIPT libpopt_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/src/libpopt.vers diff --git a/src/lookup3.c b/src/lookup3.c index 03bb89b..e974cad 100644 --- a/src/lookup3.c +++ b/src/lookup3.c @@ -270,7 +270,7 @@ uint32_t jlu32l(uint32_t h, const void *key, size_t size) * rest of the string. Every machine with memory protection I've seen * does it on word boundaries, so is OK with this. But VALGRIND will * still catch it and complain. The masking trick does make the hash - * noticably faster for short strings (like English words). + * noticeably faster for short strings (like English words). */ #ifndef VALGRIND @@ -476,7 +476,7 @@ void jlu32lpair(const void *key, size_t size, uint32_t *pc, uint32_t *pb) * rest of the string. Every machine with memory protection I've seen * does it on word boundaries, so is OK with this. But VALGRIND will * still catch it and complain. The masking trick does make the hash - * noticably faster for short strings (like English words). + * noticeably faster for short strings (like English words). */ #ifndef VALGRIND @@ -679,7 +679,7 @@ uint32_t jlu32b(uint32_t h, const void *key, size_t size) * rest of the string. Every machine with memory protection I've seen * does it on word boundaries, so is OK with this. But VALGRIND will * still catch it and complain. The masking trick does make the hash - * noticably faster for short strings (like English words). + * noticeably faster for short strings (like English words). */ #ifndef VALGRIND @@ -806,7 +806,7 @@ static void driver2(void) z=0; for (i=0; ios->next = 1; /* skip argv[0] */ con->leftovers = calloc( (size_t)(argc + 1), sizeof(*con->leftovers) ); + con->allocLeftovers = argc + 1; con->options = options; con->aliases = NULL; con->numAliases = 0; @@ -210,8 +211,14 @@ void poptResetContext(poptContext con) con->os->currAlias = NULL; con->os->nextCharArg = NULL; con->os->nextArg = _free(con->os->nextArg); - con->os->next = 1; /* skip argv[0] */ + if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) + con->os->next = 1; /* skip argv[0] */ + else + con->os->next = 0; + for (i = 0; i < con->numLeftovers; i++) { + con->leftovers[i] = _free(con->leftovers[i]); + } con->numLeftovers = 0; con->nextLeftover = 0; con->restLeftover = 0; @@ -641,7 +648,7 @@ static const char * expandNextArg(poptContext con, const char * s) { const char * a = NULL; - char *t, *te; + char *t, *t_tmp, *te; size_t tn = strlen(s) + 1; char c; @@ -667,8 +674,11 @@ expandNextArg(poptContext con, const char * s) tn += strlen(a); { size_t pos = (size_t) (te - t); - if ((t = realloc(t, tn)) == NULL) /* XXX can't happen */ + if ((t_tmp = realloc(t, tn)) == NULL) { /* XXX can't happen */ + free(t); return NULL; + } + t = t_tmp; te = stpcpy(t + pos, a); } continue; @@ -904,7 +914,23 @@ int poptSaveString(const char *** argvp, return 0; } -static unsigned int seed = 0; +static long long poptRandomValue(long long limit) +{ +#if defined(HAVE_SRANDOM) + static int seed = 1; + + if (seed) { + srandom((unsigned)getpid()); + srandom((unsigned)random()); + seed = 0; + } + + return random() % limit + 1; +#else + /* XXX avoid adding POPT_ERROR_UNIMPLEMENTED to minimize i18n churn. */ + return POPT_ERROR_BADOPERATION; +#endif +} int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong) { @@ -913,17 +939,9 @@ int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong) return POPT_ERROR_NULLARG; if (aLongLong != 0 && LF_ISSET(RANDOM)) { -#if defined(HAVE_SRANDOM) - if (!seed) { - srandom((unsigned)getpid()); - srandom((unsigned)random()); - } - aLongLong = (long long)(random() % (aLongLong > 0 ? aLongLong : -aLongLong)); - aLongLong++; -#else - /* XXX avoid adding POPT_ERROR_UNIMPLEMENTED to minimize i18n churn. */ - return POPT_ERROR_BADOPERATION; -#endif + aLongLong = poptRandomValue(aLongLong); + if (aLongLong < 0) + return aLongLong; } if (LF_ISSET(NOT)) aLongLong = ~aLongLong; @@ -954,17 +972,9 @@ int poptSaveLong(long * arg, unsigned int argInfo, long aLong) return POPT_ERROR_NULLARG; if (aLong != 0 && LF_ISSET(RANDOM)) { -#if defined(HAVE_SRANDOM) - if (!seed) { - srandom((unsigned)getpid()); - srandom((unsigned)random()); - } - aLong = random() % (aLong > 0 ? aLong : -aLong); - aLong++; -#else - /* XXX avoid adding POPT_ERROR_UNIMPLEMENTED to minimize i18n churn. */ - return POPT_ERROR_BADOPERATION; -#endif + aLong = (long)poptRandomValue(aLong); + if (aLong < 0) + return aLong; } if (LF_ISSET(NOT)) aLong = ~aLong; @@ -987,17 +997,9 @@ int poptSaveInt(int * arg, unsigned int argInfo, long aLong) return POPT_ERROR_NULLARG; if (aLong != 0 && LF_ISSET(RANDOM)) { -#if defined(HAVE_SRANDOM) - if (!seed) { - srandom((unsigned)getpid()); - srandom((unsigned)random()); - } - aLong = random() % (aLong > 0 ? aLong : -aLong); - aLong++; -#else - /* XXX avoid adding POPT_ERROR_UNIMPLEMENTED to minimize i18n churn. */ - return POPT_ERROR_BADOPERATION; -#endif + aLong = (int)poptRandomValue(aLong); + if (aLong < 0) + return aLong; } if (LF_ISSET(NOT)) aLong = ~aLong; @@ -1020,17 +1022,9 @@ int poptSaveShort(short * arg, unsigned int argInfo, long aLong) return POPT_ERROR_NULLARG; if (aLong != 0 && LF_ISSET(RANDOM)) { -#if defined(HAVE_SRANDOM) - if (!seed) { - srandom((unsigned)getpid()); - srandom((unsigned)random()); - } - aLong = random() % (aLong > 0 ? aLong : -aLong); - aLong++; -#else - /* XXX avoid adding POPT_ERROR_UNIMPLEMENTED to minimize i18n churn. */ - return POPT_ERROR_BADOPERATION; -#endif + aLong = (short)poptRandomValue(aLong); + if (aLong < 0) + return aLong; } if (LF_ISSET(NOT)) aLong = ~aLong; @@ -1269,8 +1263,21 @@ int poptGetNextOpt(poptContext con) con->os->nextArg = xstrdup(origOptString); return 0; } - if (con->leftovers != NULL) /* XXX can't happen */ - con->leftovers[con->numLeftovers++] = origOptString; + if (con->leftovers != NULL) { /* XXX can't happen */ + /* One might think we can never overflow the leftovers + array. Actually, that's true, as long as you don't + use poptStuffArgs()... */ + if ((con->numLeftovers + 1) >= (con->allocLeftovers)) { + con->allocLeftovers += 10; + con->leftovers = + realloc(con->leftovers, + sizeof(*con->leftovers) * con->allocLeftovers); + } + con->leftovers[con->numLeftovers++] + = xstrdup(origOptString); /* so a free of a stuffed + argv doesn't give us a + dangling pointer */ + } continue; } @@ -1353,21 +1360,20 @@ int poptGetNextOpt(poptContext con) nextCharArg++; if (*nextCharArg != '\0') - con->os->nextCharArg = nextCharArg + (int)(*nextCharArg == '='); + con->os->nextCharArg = nextCharArg; } if (opt == NULL) return POPT_ERROR_BADOPT; /* XXX can't happen */ - if (opt->arg && poptArgType(opt) == POPT_ARG_NONE) { - unsigned int argInfo = poptArgInfo(con, opt); - if (poptSaveInt((int *)opt->arg, argInfo, 1L)) - return POPT_ERROR_BADOPERATION; - } else if (poptArgType(opt) == POPT_ARG_VAL) { + if (poptArgType(opt) == POPT_ARG_NONE || poptArgType(opt) == POPT_ARG_VAL) { + if (longArg || (con->os->nextCharArg && con->os->nextCharArg[0] == '=')) + return POPT_ERROR_UNWANTEDARG; if (opt->arg) { + long val = poptArgType(opt) == POPT_ARG_VAL ? opt->val : 1; unsigned int argInfo = poptArgInfo(con, opt); - if (poptSaveInt((int *)opt->arg, argInfo, (long)opt->val)) + if (poptSaveInt((int *)opt->arg, argInfo, val)) return POPT_ERROR_BADOPERATION; } - } else if (poptArgType(opt) != POPT_ARG_NONE) { + } else { int rc; con->os->nextArg = _free(con->os->nextArg); @@ -1375,7 +1381,7 @@ int poptGetNextOpt(poptContext con) longArg = expandNextArg(con, longArg); con->os->nextArg = (char *) longArg; } else if (con->os->nextCharArg) { - longArg = expandNextArg(con, con->os->nextCharArg); + longArg = expandNextArg(con, con->os->nextCharArg + (int)(*con->os->nextCharArg == '=')); con->os->nextArg = (char *) longArg; con->os->nextCharArg = NULL; } else { @@ -1512,13 +1518,15 @@ poptItem poptFreeItems(poptItem items, int nitems) item->argv = _free(item->argv); item++; } - items = _free(items); + _free(items); } return NULL; } poptContext poptFreeContext(poptContext con) { + int i; + if (con == NULL) return con; poptResetContext(con); @@ -1528,7 +1536,11 @@ poptContext poptFreeContext(poptContext con) con->execs = poptFreeItems(con->execs, con->numExecs); con->numExecs = 0; + for (i = 0; i < con->numLeftovers; i++) { + con->leftovers[i] = _free(con->leftovers[i]); + } con->leftovers = _free(con->leftovers); + con->finalArgv = _free(con->finalArgv); con->appName = _free(con->appName); con->otherHelp = _free(con->otherHelp); @@ -1559,7 +1571,7 @@ int poptAddAlias(poptContext con, struct poptAlias alias, int poptAddItem(poptContext con, poptItem newItem, int flags) { - poptItem * items, item; + poptItem * items, item_tmp, item; int * nitems; switch (flags) { @@ -1576,9 +1588,10 @@ int poptAddItem(poptContext con, poptItem newItem, int flags) break; } - *items = realloc((*items), ((*nitems) + 1) * sizeof(**items)); - if ((*items) == NULL) + item_tmp = realloc((*items), ((*nitems) + 1) * sizeof(**items)); + if (item_tmp == NULL) return 1; + *items = item_tmp; item = (*items) + (*nitems); @@ -1623,6 +1636,8 @@ const char * poptStrerror(const int error) switch (error) { case POPT_ERROR_NOARG: return POPT_("missing argument"); + case POPT_ERROR_UNWANTEDARG: + return POPT_("option does not take an argument"); case POPT_ERROR_BADOPT: return POPT_("unknown option"); case POPT_ERROR_BADOPERATION: diff --git a/src/popt.h b/src/popt.h index 38a5478..bd16061 100644 --- a/src/popt.h +++ b/src/popt.h @@ -1,5 +1,4 @@ -/** \file popt/popt.h - * \ingroup popt +/** @file */ /* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING @@ -13,10 +12,9 @@ #define POPT_OPTION_DEPTH 10 -/** \ingroup popt +/** * \name Arg type identifiers */ -/*@{*/ #define POPT_ARG_NONE 0U /*!< no arg */ #define POPT_ARG_STRING 1U /*!< arg will be saved as string */ #define POPT_ARG_INT 2U /*!< arg ==> int */ @@ -43,12 +41,9 @@ #define POPT_ARG_MASK 0x000000FFU #define POPT_GROUP_MASK 0x0000FF00U -/*@}*/ - -/** \ingroup popt +/** * \name Arg modifiers */ -/*@{*/ #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) */ @@ -72,28 +67,24 @@ #define POPT_ARGFLAG_RANDOM 0x00400000U /*!< random value in [1,arg] */ #define POPT_ARGFLAG_TOGGLE 0x00200000U /*!< permit --[no]opt prefix toggle */ -/*@}*/ - -/** \ingroup popt +/** * \name Callback modifiers */ -/*@{*/ #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 0x10000000U /*!< don't callback with option */ #define POPT_CBFLAG_CONTINUE 0x08000000U /*!< continue callbacks with option */ -/*@}*/ -/** \ingroup popt +/** * \name Error return values */ -/*@{*/ #define POPT_ERROR_NOARG -10 /*!< missing argument */ #define POPT_ERROR_BADOPT -11 /*!< unknown option */ +#define POPT_ERROR_UNWANTEDARG -12 /*!< option does not take an argument */ #define POPT_ERROR_OPTSTOODEEP -13 /*!< aliases nested too deeply */ -#define POPT_ERROR_BADQUOTE -15 /*!< error in paramter quoting */ +#define POPT_ERROR_BADQUOTE -15 /*!< error in parameter quoting */ #define POPT_ERROR_ERRNO -16 /*!< errno set, use strerror(errno) */ #define POPT_ERROR_BADNUMBER -17 /*!< invalid numeric value */ #define POPT_ERROR_OVERFLOW -18 /*!< number too large or too small */ @@ -101,38 +92,33 @@ #define POPT_ERROR_NULLARG -20 /*!< opt->arg should not be NULL */ #define POPT_ERROR_MALLOC -21 /*!< memory allocation failed */ #define POPT_ERROR_BADCONFIG -22 /*!< config file failed sanity test */ -/*@}*/ -/** \ingroup popt +/** * \name poptBadOption() flags */ -/*@{*/ #define POPT_BADOPTION_NOALIAS (1U << 0) /*!< don't go into an alias */ -/*@}*/ -/** \ingroup popt +/** * \name poptGetContext() flags */ -/*@{*/ #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 +/** */ struct poptOption { const char * longName; /*!< may be NULL */ - char shortName; /*!< may be NUL */ - unsigned int argInfo; + char shortName; /*!< may be '\0' */ + unsigned int argInfo; /*!< type of argument expected after the option */ void * arg; /*!< depends on argInfo */ - int val; /*!< 0 means don't return, just update flag */ + int val; /*!< 0 means don't return, just update arg */ const char * descrip; /*!< description for autohelp -- may be NULL */ - const char * argDescrip; /*!< argument description for autohelp */ + const char * argDescrip; /*!< argument description for autohelp -- may be NULL */ }; -/** \ingroup popt +/** * A popt alias argument for poptAddAlias(). */ struct poptAlias { @@ -142,7 +128,7 @@ struct poptAlias { const char ** argv; /*!< must be free()able */ }; -/** \ingroup popt +/** * A popt alias or exec argument for poptAddItem(). */ typedef struct poptItem_s { @@ -151,10 +137,9 @@ typedef struct poptItem_s { const char ** argv; /*!< (alias) args, must be free()able. */ } * poptItem; -/** \ingroup popt +/** * \name Auto-generated help/usage */ -/*@{*/ /** * Empty table marker to enable displaying popt alias/exec options. @@ -174,19 +159,18 @@ extern struct poptOption * poptHelpOptionsI18N; 0, "Help options:", NULL }, #define POPT_TABLEEND { NULL, '\0', 0, NULL, 0, NULL, NULL } -/*@}*/ -/** \ingroup popt +/** */ typedef struct poptContext_s * poptContext; -/** \ingroup popt +/** */ #ifndef __cplusplus typedef struct poptOption * poptOption; #endif -/** \ingroup popt +/** */ enum poptCallbackReason { POPT_CALLBACK_REASON_PRE = 0, @@ -198,7 +182,7 @@ enum poptCallbackReason { extern "C" { #endif -/** \ingroup popt +/** * Table callback prototype. * @param con context * @param reason reason for callback @@ -212,14 +196,14 @@ typedef void (*poptCallbackType) (poptContext con, const char * arg, const void * data); -/** \ingroup popt +/** * Destroy context. * @param con context * @return NULL always */ poptContext poptFreeContext( poptContext con); -/** \ingroup popt +/** * Initialize popt context. * @param name context name (usually argv[0] program name) * @param argc no. of arguments @@ -234,14 +218,14 @@ poptContext poptGetContext( const struct poptOption * options, unsigned int flags); -/** \ingroup popt +/** * Destroy context (alternative implementation). * @param con context * @return NULL always */ poptContext poptFini( poptContext con); -/** \ingroup popt +/** * Initialize popt context (alternative implementation). * This routine does poptGetContext() and then poptReadConfigFiles(). * @param argc no. of arguments @@ -254,58 +238,56 @@ poptContext poptInit(int argc, const char ** argv, const struct poptOption * options, const char * configPaths); -/** \ingroup popt +/** * Reinitialize popt context. * @param con context */ void poptResetContext(poptContext con); -/** \ingroup popt +/** * Return value of next option found. * @param con context * @return next option val, -1 on last item, POPT_ERROR_* on error */ int poptGetNextOpt(poptContext con); -/** \ingroup popt +/** * Return next option argument (if any). * @param con context * @return option argument, NULL if no argument is available */ char * poptGetOptArg(poptContext con); -/** \ingroup popt +/** * Return next argument. * @param con context * @return next argument, NULL if no argument is available */ const char * poptGetArg(poptContext con); -/** \ingroup popt +/** * Peek at current argument. * @param con context * @return current argument, NULL if no argument is available */ -const char * poptPeekArg(poptContext con) - /*@*/; +const char * poptPeekArg(poptContext con); -/** \ingroup popt +/** * Return remaining arguments. * @param con context * @return argument array, NULL terminated */ const char ** poptGetArgs(poptContext con); -/** \ingroup popt +/** * Return the option which caused the most recent error. * @param con context * @param flags * @return offending option */ -const char * poptBadOption(poptContext con, unsigned int flags) - /*@*/; +const char * poptBadOption(poptContext con, unsigned int flags); -/** \ingroup popt +/** * Add arguments to context. * @param con context * @param argv argument array, NULL terminated @@ -313,7 +295,7 @@ const char * poptBadOption(poptContext con, unsigned int flags) */ int poptStuffArgs(poptContext con, const char ** argv); -/** \ingroup popt +/** * Add alias to context. * @todo Pass alias by reference, not value. * @deprecated Use poptAddItem instead. @@ -324,7 +306,7 @@ int poptStuffArgs(poptContext con, const char ** argv); */ int poptAddAlias(poptContext con, struct poptAlias alias, int flags); -/** \ingroup popt +/** * Add alias/exec item to context. * @param con context * @param newItem alias/exec item to add @@ -333,7 +315,7 @@ int poptAddAlias(poptContext con, struct poptAlias alias, int flags); */ int poptAddItem(poptContext con, poptItem newItem, int flags); -/** \ingroup popt +/** * Test path/file for config file sanity (regular file, permissions etc) * @param fn file name * @return 1 on OK, 0 on NOTOK. @@ -352,7 +334,7 @@ int poptReadFile(const char * fn, char ** bp, size_t * nbp, int flags); #define POPT_READFILE_TRIMNEWLINES 1 -/** \ingroup popt +/** * Read configuration file. * @param con context * @param fn file name to read @@ -360,10 +342,10 @@ int poptReadFile(const char * fn, char ** bp, */ int poptReadConfigFile(poptContext con, const char * fn); -/** \ingroup popt +/** * Read configuration file(s). * Colon separated files to read, looping over poptReadConfigFile(). - * Note that an '@' character preceeding a path in the list will + * Note that an '@' character preceding a path in the list will * also perform additional sanity checks on the file before reading. * @param con context * @param paths colon separated file name(s) to read @@ -371,7 +353,7 @@ int poptReadConfigFile(poptContext con, const char * fn); */ int poptReadConfigFiles(poptContext con, const char * paths); -/** \ingroup popt +/** * Read default configuration from /etc/popt and $HOME/.popt. * @param con context * @param useEnv (unused) @@ -379,7 +361,7 @@ int poptReadConfigFiles(poptContext con, const char * paths); */ int poptReadDefaultConfig(poptContext con, int useEnv); -/** \ingroup popt +/** * Duplicate an argument array. * @note: The argument array is malloc'd as a single area, so only argv must * be free'd. @@ -394,7 +376,7 @@ int poptDupArgv(int argc, const char **argv, int * argcPtr, const char *** argvPtr); -/** \ingroup popt +/** * Parse a string into an argument array. * The parse allows ', ", and \ quoting, but ' is treated the same as " and * both may include \ quotes. @@ -408,7 +390,7 @@ int poptDupArgv(int argc, const char **argv, int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr); -/** \ingroup popt +/** * Parses an input configuration file and returns an string that is a * command line. For use with popt. You must free the return value when done. * @@ -423,8 +405,8 @@ bla=bla this_is = fdsafdas bad_line= - reall bad line - reall bad line = again + really bad line + really bad line = again 5555= 55555 test = with lots of spaces \endverbatim @@ -456,14 +438,14 @@ this_is = fdsafdas */ int poptConfigFileToString(FILE *fp, char ** argstrp, int flags); -/** \ingroup popt +/** * Return formatted error string for popt failure. * @param error popt error * @return error string */ const char * poptStrerror(const int error); -/** \ingroup popt +/** * Limit search for executables. * @param con context * @param path single path to search for executables @@ -471,38 +453,37 @@ const char * poptStrerror(const int error); */ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute); -/** \ingroup popt +/** * Print detailed description of options. * @param con context - * @param fp ouput file handle + * @param fp output file handle * @param flags (unused) */ void poptPrintHelp(poptContext con, FILE * fp, int flags); -/** \ingroup popt +/** * Print terse description of options. * @param con context - * @param fp ouput file handle + * @param fp output file handle * @param flags (unused) */ void poptPrintUsage(poptContext con, FILE * fp, int flags); -/** \ingroup popt +/** * Provide text to replace default "[OPTION...]" in help/usage output. * @param con context * @param text replacement text */ void poptSetOtherOptionHelp(poptContext con, const char * text); -/** \ingroup popt +/** * Return argv[0] from context. * @param con context * @return argv[0] */ -const char * poptGetInvocationName(poptContext con) - /*@*/; +const char * poptGetInvocationName(poptContext con); -/** \ingroup popt +/** * Shuffle argv pointers to remove stripped args, returns new argc. * @param con context * @param argc no. of args @@ -567,9 +548,9 @@ typedef struct poptBits_s { unsigned int bits[1]; } * poptBits; -#define _POPT_BITS_N 1024U /* estimated population */ +#define _POPT_BITS_N 1024U /*!< estimated population */ #define _POPT_BITS_M ((3U * _POPT_BITS_N) / 2U) -#define _POPT_BITS_K 16U /* no. of linear hash combinations */ +#define _POPT_BITS_K 16U /*!< no. of linear hash combinations */ extern unsigned int _poptBitsN; extern unsigned int _poptBitsM; diff --git a/src/poptconfig.c b/src/poptconfig.c index 9d97ccd..bf201e2 100644 --- a/src/poptconfig.c +++ b/src/poptconfig.c @@ -1,5 +1,5 @@ /** \ingroup popt - * \file popt/poptconfig.c + * @file */ /* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING @@ -21,7 +21,7 @@ #if defined(HAVE_GLOB_H) #include -#if !defined(__GLIBC__) +#if !defined(HAVE_GLOB_PATTERN_P) /* Return nonzero if PATTERN contains any metacharacters. Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ static int @@ -136,13 +136,17 @@ int poptReadFile(const char * fn, char ** bp, size_t * nbp, int flags) goto exit; if ((nb = lseek(fdno, 0, SEEK_END)) == (off_t)-1 + || (uintmax_t)nb >= SIZE_MAX || lseek(fdno, 0, SEEK_SET) == (off_t)-1 || (b = calloc(sizeof(*b), (size_t)nb + 1)) == NULL || read(fdno, (char *)b, (size_t)nb) != (ssize_t)nb) { int oerrno = errno; (void) close(fdno); - errno = oerrno; + if (nb != (off_t)-1 && (uintmax_t)nb >= SIZE_MAX) + errno = -EOVERFLOW; + else + errno = oerrno; goto exit; } if (close(fdno) == -1) @@ -340,13 +344,15 @@ int poptReadConfigFile(poptContext con, const char * fn) char * b = NULL, *be; size_t nb = 0; const char *se; - char *t, *te; + char *t = NULL, *te; int rc; if ((rc = poptReadFile(fn, &b, &nb, POPT_READFILE_TRIMNEWLINES)) != 0) return (errno == ENOENT ? 0 : rc); - if (b == NULL || nb == 0) - return POPT_ERROR_BADCONFIG; + if (b == NULL || nb == 0) { + rc = POPT_ERROR_BADCONFIG; + goto exit; + } if ((t = malloc(nb + 1)) == NULL) goto exit; diff --git a/src/popthelp.c b/src/popthelp.c index 3c05acb..6738f6a 100644 --- a/src/popthelp.c +++ b/src/popthelp.c @@ -1,7 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /** \ingroup popt - * \file popt/popthelp.c + * @file */ /* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING @@ -15,8 +15,7 @@ #include #endif -#define POPT_WCHAR_HACK -#ifdef POPT_WCHAR_HACK +#ifdef HAVE_MBSRTOWCS #include /* for mbsrtowcs */ #endif #include "poptint.h" @@ -30,6 +29,7 @@ * @param arg (unused) * @param data (unused) */ +NORETURN static void displayArgs(poptContext con, UNUSED(enum poptCallbackReason foo), struct poptOption * key, @@ -41,7 +41,7 @@ static void displayArgs(poptContext con, else poptPrintUsage(con, stdout, 0); - con = poptFreeContext(con); + poptFreeContext(con); exit(0); } @@ -67,7 +67,7 @@ struct poptOption poptHelpOptions[] = { } ; static struct poptOption poptHelpOptions2[] = { - { NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL}, + { NULL, '\0', POPT_ARG_INTL_DOMAIN, (void *)PACKAGE, 0, NULL, 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 }, @@ -118,7 +118,7 @@ static size_t maxColumnWidth(FILE *fp) static inline size_t stringDisplayWidth(const char *s) { size_t n = strlen(s); -#ifdef POPT_WCHAR_HACK +#ifdef HAVE_MBSRTOWCS mbstate_t t; memset ((void *)&t, 0, sizeof (t)); /* In initial state. */ @@ -312,7 +312,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns, if (!(prtshort || prtlong)) goto out; if (prtshort && prtlong) { - char *dash = F_ISSET(opt, ONEDASH) ? "-" : "--"; + const char *dash = F_ISSET(opt, ONEDASH) ? "-" : "--"; left[0] = '-'; left[1] = opt->shortName; (void) stpcpy(stpcpy(stpcpy(left+2, ", "), dash), opt->longName); @@ -322,8 +322,8 @@ static void singleOptionHelp(FILE * fp, columns_t columns, left[2] = '\0'; } else if (prtlong) { /* XXX --long always padded for alignment with/without "-X, ". */ - char *dash = poptArgType(opt) == POPT_ARG_MAINCALL ? "" - : (F_ISSET(opt, ONEDASH) ? "-" : "--"); + const char *dash = poptArgType(opt) == POPT_ARG_MAINCALL ? "" + : (F_ISSET(opt, ONEDASH) ? "-" : "--"); const char *longName = opt->longName; const char *toggle; if (F_ISSET(opt, TOGGLE)) { @@ -416,7 +416,8 @@ static void singleOptionHelp(FILE * fp, columns_t columns, /* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */ if (!strchr(" =(", argDescrip[0])) *le++ = ((poptArgType(opt) == POPT_ARG_MAINCALL) ? ' ' : - (poptArgType(opt) == POPT_ARG_ARGV) ? ' ' : '='); + (poptArgType(opt) == POPT_ARG_ARGV) ? ' ' : + opt->longName == NULL ? ' ' : '='); le = stpcpy(leo = le, argDescrip); /* Adjust for (possible) wide characters. */ @@ -611,9 +612,10 @@ static void singleTableHelp(poptContext con, FILE * fp, */ static size_t showHelpIntro(poptContext con, FILE * fp) { - size_t len = (size_t)6; + const char *usage_str = POPT_("Usage:"); + size_t len = strlen(usage_str); + POPT_fprintf(fp, "%s", usage_str); - POPT_fprintf(fp, POPT_("Usage:")); if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) { struct optionStackEntry * os = con->optionStack; const char * fn = (os->argv ? os->argv[0] : NULL); @@ -700,7 +702,7 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns, if (argDescrip) { /* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */ - if (!strchr(" =(", argDescrip[0])) fprintf(fp, "="); + if (!strchr(" =(", argDescrip[0])) fputc(opt->longName == NULL ? ' ' : '=', fp); fprintf(fp, "%s", argDescrip); } fprintf(fp, "]"); diff --git a/src/poptint.c b/src/poptint.c index 0cec176..b8dc90f 100644 --- a/src/poptint.c +++ b/src/poptint.c @@ -38,7 +38,7 @@ POPT_next_char (const char *str) #if !defined(POPT_fprintf) /* XXX lose all the goop ... */ -#if defined(HAVE_DCGETTEXT) +#if defined(ENABLE_NLS) && defined(HAVE_LIBINTL_H) && defined(HAVE_DCGETTEXT) /* * Rebind a "UTF-8" codeset for popt's internal use. */ @@ -85,14 +85,17 @@ strdup_locale_from_utf8 (char * istr) char * shift_pin = NULL; size_t db = strlen(istr); char * dstr = malloc((db + 1) * sizeof(*dstr)); + char * dstr_tmp; char * pin = istr; char * pout = dstr; size_t ib = db; size_t ob = db; size_t err; - if (dstr == NULL) + if (dstr == NULL) { + (void) iconv_close(cd); return NULL; + } err = iconv(cd, NULL, NULL, NULL, NULL); while (1) { *pout = '\0'; @@ -109,12 +112,16 @@ strdup_locale_from_utf8 (char * istr) case E2BIG: { size_t used = (size_t)(pout - dstr); db *= 2; - dstr = realloc(dstr, (db + 1) * sizeof(*dstr)); - if (dstr != NULL) { - pout = dstr + used; - ob = db - used; - continue; + dstr_tmp = realloc(dstr, (db + 1) * sizeof(*dstr)); + if (dstr_tmp == NULL) { + free(dstr); + (void) iconv_close(cd); + return NULL; } + dstr = dstr_tmp; + pout = dstr + used; + ob = db - used; + continue; } break; case EINVAL: case EILSEQ: diff --git a/src/poptint.h b/src/poptint.h index b64e123..001c5c3 100644 --- a/src/poptint.h +++ b/src/poptint.h @@ -1,5 +1,5 @@ /** \ingroup popt - * \file popt/poptint.h + * @file */ /* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING @@ -33,7 +33,7 @@ typedef struct { } pbm_set; #define __PBM_BITS(set) ((set)->bits) -#define PBM_ALLOC(d) calloc(__PBM_IX (d) + 1, sizeof(__pbm_bits)) +#define PBM_ALLOC(d) calloc(__PBM_IX (d) + 1, sizeof(pbm_set)) #define PBM_FREE(s) _free(s); #define PBM_SET(d, s) (__PBM_BITS (s)[__PBM_IX (d)] |= __PBM_MASK (d)) #define PBM_CLR(d, s) (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d)) @@ -94,6 +94,7 @@ struct poptContext_s { struct optionStackEntry * os; poptArgv leftovers; int numLeftovers; + int allocLeftovers; int nextLeftover; const struct poptOption * options; int restLeftover; @@ -126,6 +127,7 @@ struct poptContext_s { char *POPT_dgettext(const char * dom, const char * str); #endif +FORMAT(printf, 2, 3) int POPT_fprintf (FILE* stream, const char *format, ...); #endif /* !defined(POPT_fprintf) */ @@ -144,7 +146,7 @@ const char *POPT_next_char (const char *str); #define _(foo) foo #endif -#if defined(ENABLE_NLS) && defined(HAVE_DCGETTEXT) +#if defined(ENABLE_NLS) && defined(HAVE_LIBINTL_H) && defined(HAVE_DCGETTEXT) #define D_(dom, str) POPT_dgettext(dom, str) #define POPT_(foo) D_("popt", foo) #else diff --git a/src/poptparse.c b/src/poptparse.c index 2fc8245..5afc6c5 100644 --- a/src/poptparse.c +++ b/src/poptparse.c @@ -1,5 +1,5 @@ /** \ingroup popt - * \file popt/poptparse.c + * @file */ /* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING @@ -57,6 +57,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr) char quote = '\0'; int argvAlloced = POPT_ARGV_ARRAY_GROW_DELTA; const char ** argv = malloc(sizeof(*argv) * argvAlloced); + const char ** argv_tmp; int argc = 0; size_t buflen = strlen(s) + 1; char * buf, * bufOrig = NULL; @@ -88,8 +89,9 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr) buf++, argc++; if (argc == argvAlloced) { argvAlloced += POPT_ARGV_ARRAY_GROW_DELTA; - argv = realloc(argv, sizeof(*argv) * argvAlloced); - if (argv == NULL) goto exit; + argv_tmp = realloc(argv, sizeof(*argv) * argvAlloced); + if (argv_tmp == NULL) goto exit; + argv = argv_tmp; } argv[argc] = buf; } @@ -124,7 +126,7 @@ exit: } /* still in the dev stage. - * return values, perhaps 1== file erro + * return values, perhaps 1== file error * 2== line to long * 3== umm.... more? */ @@ -133,6 +135,7 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, { char line[999]; char * argstr; + char * argstr_tmp; char * p; char * q; char * x; @@ -186,8 +189,12 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, argvlen += (t = (size_t)(q - p)) + (sizeof(" --")-1); if (argvlen >= maxargvlen) { maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2; - argstr = realloc(argstr, maxargvlen); - if (argstr == NULL) return POPT_ERROR_MALLOC; + argstr_tmp = realloc(argstr, maxargvlen); + if (argstr_tmp == NULL) { + free(argstr); + return POPT_ERROR_MALLOC; + } + argstr = argstr_tmp; } strcat(argstr, " --"); strcat(argstr, p); @@ -215,8 +222,12 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, argvlen += t + (sizeof("' --='")-1); if (argvlen >= maxargvlen) { maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2; - argstr = realloc(argstr, maxargvlen); - if (argstr == NULL) return POPT_ERROR_MALLOC; + argstr_tmp = realloc(argstr, maxargvlen); + if (argstr_tmp == NULL) { + free(argstr); + return POPT_ERROR_MALLOC; + } + argstr = argstr_tmp; } strcat(argstr, " --"); strcat(argstr, p); diff --git a/src/system.h b/src/system.h index aac10b7..5faeabe 100644 --- a/src/system.h +++ b/src/system.h @@ -1,5 +1,5 @@ /** - * \file popt/system.h + * @file */ #ifdef HAVE_CONFIG_H @@ -9,7 +9,7 @@ #include /* XXX isspace(3) has i18n encoding signednesss issues on Solaris. */ -#define _isspaceptr(_chp) isspace((int)(*(unsigned char *)(_chp))) +#define _isspaceptr(_chp) isspace((int)(*(unsigned const char *)(_chp))) #ifdef HAVE_MCHECK_H #include @@ -63,5 +63,7 @@ static inline char * stpcpy (char *dest, const char * src) { #define __attribute__(x) #endif #define UNUSED(x) x __attribute__((__unused__)) +#define FORMAT(a, b, c) __attribute__((__format__ (a, b, c))) +#define NORETURN __attribute__((__noreturn__)) #include "popt.h" diff --git a/tests/Makefile.am b/tests/Makefile.am index 47f0f11..c410389 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,19 +1,26 @@ # Makefile for popt library. -EXTRA_DIST = testit.sh test-poptrc +EXTRA_DIST = testit.sh \ + test-poptrc \ + test3-data/01.answer \ + test3-data/01.input \ + test3-data/02.answer \ + test3-data/02.input \ + test3-data/03.answer \ + test3-data/03.input AM_CPPFLAGS = -I. -I$(top_srcdir)/src -noinst_PROGRAMS = test1 test2 tdict # test3 +noinst_PROGRAMS = test1 test2 tdict test3 test1_SOURCES = test1.c test1_LDFLAGS = test1_LDADD = $(top_builddir)/src/libpopt.la test2_SOURCES = test2.c test2_LDFLAGS = test2_LDADD = $(top_builddir)/src/libpopt.la -#test3_SOURCES = test3.c -#test3_LDFLAGS = -#ltest3_LDADD = $(top_builddir)/src/libpopt.la +test3_SOURCES = test3.c +test3_LDFLAGS = +test3_LDADD = $(top_builddir)/src/libpopt.la tdict_SOURCES = tdict.c tdict_LDFLAGS = tdict_LDADD = $(top_builddir)/src/libpopt.la diff --git a/tests/tdict.c b/tests/tdict.c index b2e0859..762905e 100644 --- a/tests/tdict.c +++ b/tests/tdict.c @@ -15,7 +15,6 @@ static struct { static int loadDict(const char * fn, poptBits * ap) { char b[BUFSIZ]; - size_t nb = sizeof(b); FILE * fp = fopen(fn, "r"); char * t, *te; int nlines = -1; @@ -23,7 +22,7 @@ static int loadDict(const char * fn, poptBits * ap) if (fp == NULL || ferror(fp)) goto exit; nlines = 0; - while ((t = fgets(b, nb, fp)) != NULL) { + while ((t = fgets(b, sizeof(b), fp)) != NULL) { while (*t && isspace(*t)) t++; if (*t == '#') continue; te = t + strlen(t); @@ -69,7 +68,7 @@ int main(int argc, const char ** argv) goto exit; _poptBitsK = 2; _poptBitsM = 0; - _poptBitsN = _poptBitsK * rc; + _poptBitsN = _poptBitsK * (unsigned)rc; optCon = poptGetContext("tdict", argc, argv, options, 0); @@ -78,7 +77,7 @@ int main(int argc, const char ** argv) char * optArg = poptGetOptArg(optCon); if (optArg) free(optArg); switch (rc) { - default: goto exit; break; + default: goto exit; } } if (rc < -1) { diff --git a/tests/test1.c b/tests/test1.c index 50632be..63c4593 100644 --- a/tests/test1.c +++ b/tests/test1.c @@ -15,7 +15,7 @@ static void option_callback(UNUSED(poptContext con), } static int arg1 = 0; -static char * arg2 = "(none)"; +static const char * arg2 = "(none)"; static int arg3 = 0; static int inc = 0; static int shortopt = 0; @@ -33,8 +33,8 @@ static long aLong = 738905609L; static long bLong = 738905609L; static long long aLongLong = 738905609LL; static long long bLongLong = 738905609LL; -static float aFloat = 3.1415926535; -static float bFloat = 3.1415926535; +static float aFloat = 3.1415926535f; +static float bFloat = 3.1415926535f; static double aDouble = 9.86960440108935861883; static double bDouble = 9.86960440108935861883; @@ -48,7 +48,7 @@ static size_t nattributes = (sizeof(attributes) / sizeof(attributes[0])); static char * oStr = (char *) -1; static int singleDash = 0; -static char * lStr = +static const char * lStr = "This tests default strings and exceeds the ... limit. " "123456789+123456789+123456789+123456789+123456789+ " "123456789+123456789+123456789+123456789+123456789+ " @@ -132,7 +132,7 @@ static struct poptOption options[] = { "POPT_BIT_SET: |= 0x7777", 0}, { "bitclr", '\0', POPT_BIT_CLR | POPT_ARGFLAG_TOGGLE | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0xf842, "POPT_BIT_CLR: &= ~0xf842", 0}, - { "bitxor", '\0', POPT_ARG_VAL | POPT_ARGFLAG_XOR | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, (0x8ace^0xfeed), + { "bitxor", 'x', POPT_ARG_VAL | POPT_ARGFLAG_XOR | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, (0x8ace^0xfeed), "POPT_ARGFLAG_XOR: ^= (0x8ace^0xfeed)", 0}, { "nstr", '\0', POPT_ARG_STRING | POPT_ARGFLAG_SHOW_DEFAULT, &nStr, 0, @@ -209,7 +209,7 @@ int main(int argc, const char ** argv) #if 1 while ((rc = poptGetNextOpt(optCon)) > 0) /* Read all the options ... */ - {}; + {} poptResetContext(optCon); /* ... and then start over. */ resetVars(); diff --git a/tests/test2.c b/tests/test2.c index 8414b90..4e86d38 100644 --- a/tests/test2.c +++ b/tests/test2.c @@ -11,38 +11,36 @@ #include "system.h" -char *PathnameOfKeyFile = NULL; -char *PathnameOfOfferFile = NULL; - -char *txHost = NULL; -int txSslPort = 443; -int txStoreId = 0; - -char *contentProtocol = NULL; -char *contentHost = NULL; -int contentPort = 80; -char *contentPath = NULL; - -char *dbPassword = NULL; -char *dbUserName = NULL; - -char *rcfile = "createuser-defaults"; -char *username=NULL; - -char *password = NULL; -char *firstname = NULL; -char *lastname = NULL; -char *addr1 = NULL; -char *addr2 = NULL; -char *city = NULL; -char *state = NULL; -char *postal = NULL; -char *country = NULL; - -char *email = NULL; - -char *dayphone = NULL; -char *fax = NULL; +static char *PathnameOfKeyFile = NULL; +static char *PathnameOfOfferFile = NULL; + +static char *txHost = NULL; +static int txSslPort = 443; +static int txStoreId = 0; + +static char *contentHost = NULL; +static char *contentPath = NULL; + +static char *dbPassword = NULL; +static char *dbUserName = NULL; + +static const char *rcfile = "createuser-defaults"; +static char *username = NULL; + +static char *password = NULL; +static char *firstname = NULL; +static char *lastname = NULL; +static char *addr1 = NULL; +static char *addr2 = NULL; +static char *city = NULL; +static char *state = NULL; +static char *postal = NULL; +static char *country = NULL; + +static char *email = NULL; + +static char *dayphone = NULL; +static char *fax = NULL; int diff --git a/tests/test3-data/01.input b/tests/test3-data/01.input index 157ed05..c25254e 100644 --- a/tests/test3-data/01.input +++ b/tests/test3-data/01.input @@ -7,7 +7,7 @@ bla=bla this_is = fdsafdas bad_line= - reall bad line - reall bad line = again + really bad line + really bad line = again 5555= 55555 test = with lots of spaces diff --git a/tests/test3.c b/tests/test3.c index 4c8a75c..aa91167 100644 --- a/tests/test3.c +++ b/tests/test3.c @@ -1,8 +1,6 @@ -#include -#include #include -#include -#include + +#include "system.h" int main (int argc, char **argv) { char *out; @@ -39,6 +37,7 @@ int main (int argc, char **argv) { printf ("'%s'\n", newargv[j]); printf ("\n"); + free(newargv); free(out); fclose (fp); } diff --git a/tests/testit.sh b/tests/testit.sh old mode 100755 new mode 100644 index 2a7b4aa..04713f5 --- a/tests/testit.sh +++ b/tests/testit.sh @@ -5,12 +5,11 @@ run() { name=$1; shift answer=$1; shift - echo Running test $name. - result=`HOME=$builddir $builddir/$prog $*` if [ "$answer" != "$result" ]; then - echo "Test \"$prog $*\" failed with: \"$result\" != \"$answer\" " - exit 2 + echo "FAIL: $name: \"$result\" != \"$answer\" " + else + echo "PASS: $name" fi } @@ -23,26 +22,23 @@ run_diff() { out=$builddir/tmp.out diff_file=$builddir/tmp.diff - echo Running test $name. - $builddir/$prog $in_file > $out ret=$? diff $out $answer_file > $diff_file diff_ret=$? if [ "$diff_ret" != "0" ]; then - echo "Test \"$name\" failed output is in $out, diff is:" + echo "FAIL $name: failed output is in $out, diff is:" cat $diff_file - exit 2 + else + echo "PASS $name" fi rm $out $diff_file } builddir=`pwd` -srcdir=$builddir -cd ${srcdir} -test1=${builddir}/test1 -echo "Running tests in `pwd`" +cd ${builddir} +echo "Running tests in ${builddir}" #make -q testcases @@ -115,16 +111,16 @@ run test1 "test1 - 56" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar run test1 "test1 - 58" "\ -Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] +Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val] [-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG] [-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE] [--randint=INT] [--randshort=SHORT] [--randlong=LONG] [--randlonglong=LONGLONG] [--argv=STRING] [--bitset] [--bitclr] - [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc] + [-x|--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc] [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage run test1 "test1 - 59" "\ -Usage: lt-test1 [OPTION...] +Usage: test1 [OPTION...] --arg1 First argument with a really long description. After all, we have to test argument help wrapping somehow, right? @@ -149,7 +145,7 @@ Usage: lt-test1 [OPTION...] (can be used multiple times) --[no]bitset POPT_BIT_SET: |= 0x7777 --[no]bitclr POPT_BIT_CLR: &= ~0xf842 - --bitxor POPT_ARGFLAG_XOR: ^= (0x8ace^0xfeed) + -x, --bitxor POPT_ARGFLAG_XOR: ^= (0x8ace^0xfeed) --nstr=STRING POPT_ARG_STRING: (null) (default: null) --lstr=STRING POPT_ARG_STRING: \"123456789...\" (default: \"This tests default strings and exceeds the @@ -171,9 +167,18 @@ Help options: -?, --help Show this help message --usage Display brief usage message" --help -#run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer -#run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer -#run_diff test3 "test3 - 53" test3-data/03.input test3-data/03.answer +run test1 "test1 - 60" "" --val=foo +run test1 "test1 - 61" "" -x=f1 + +run test1 "test1 - 62" "arg1: 0 arg2: (none) aInt: 1" --randint=-1 + +if ! [ -e test3-data ]; then + # create symlink for running during 'make distcheck' + ln -s "${srcdir}/test3-data" test3-data +fi +run_diff test3 "test3 - 1" test3-data/01.input test3-data/01.answer +run_diff test3 "test3 - 2" test3-data/02.input test3-data/02.answer +run_diff test3 "test3 - 3" test3-data/03.input test3-data/03.answer echo "" echo "Passed." -- Gitee