diff options
88 files changed, 8408 insertions, 10313 deletions
@@ -1,27 +1,53 @@ 4.2 -> 4.3: - upgrade to zlib-1.2.beta7. - - pass structure pointer, not args, through headerSprintf call chain. - - add ":xml" header format modifier. - - --queryformat '[%%{*:xml}\n]' to dump header content in XML. - fix: short option help missing string terminator. - unify signal handling in librpmio, use condvar to deliver signal. - - resurrect manifests, RPMRC_NOTFOUND returned by readLead(). - permit secondary tag match patterns with RPMQV_ALL. - - python: missed tuple refcount in IDTXload/IDTXglob. - - fix: IDTXglob should return REMOVETID sorted headers (#89857). - fix: cut-n-paste error setting nopromote for Conflicts: (#81965). - don't use error string after gzclose (Dmitry V. Levin). + +4.2 -> 4.2.1: - fix: nested %if handling, optind initialization posix vs. glibc. - add version check for package with provides and obsoletes. + - hack out O_DIRECT support in db4 for now. + - build with external beecrypt-3.0.0. - x86_64 -> athlon, ppc64[ip]series -> ppc64 arch compatibility. - treat missing epoch's exactly the same as Epoch: 0. + - pass structure pointer, not args, through headerSprintf call chain. + - add ":xml" header format modifier. + - --queryformat '[%%{*:xml}\n]' to dump header content in XML. - add ".arch" suffix to erase colored packages with identical NEVR. - update ja man pages (#92261). + - backport rpmsw stopwatch, insturment rpmts operations. + ? toy method to enable --stats through bindings. + - fdCLose typo (#97257). - brp-python-bytecompile to automagically bytecode compile python. + ? update for fr.po (#97829). - don't attempt to remove dbenv on --rebuilddb. - autorelocate ix86 package file paths on ia64. + - resurrect manifests, RPMRC_NOTFOUND returned by readLead(). + - python: missed tuple refcount in IDTXload/IDTXglob. + - fix: IDTXglob should return REMOVETID sorted headers (#89857). - resolve elf32/elf64 file conflicts to prefer elf64. - apply debugedit patch necessary to produce kernel -debuginfo files. + ? ia64: autorelocate only colored, not every, file when installing. + ? repair find-debuginfo.sh to avoid recursing in /usr/lib/debug. + ? fix: ia64: don't attempt autorelocate on .src.rpm's. + ? fix: debuginfo: -not -path /usr/lib/debug needed -prune too. + ? fix: packages w/o file colors segfault. + ? add amd64 as alias for x86_64 (#99553). + ? fix: add -n to brp-compress to avoid needless file conflicts. + ? fix: ia32 on ia64 segfaults because of automagic file relocations. + ? speed up convertdb1 (#103206). + ? revert i18n table change to preserve help array size. + ? add config directories for ppc64pseries/ppc64iseries. + ? filter GLIBC_PRIVATE dependencies. + - fix: check added provides against installed conflicts (#110317). + - changes for python 2.3 + - changes for libtool-1.5 + - changes for automake-1.7.8 + - changes for db-4.2.42. + - splint fiddles. 4.1 -> 4.2: - set cachesize without a dbenv, the default is far too small. diff --git a/Makefile.am b/Makefile.am index ff420f3ae..dac60743a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,8 +75,10 @@ rpmd.o: $(top_srcdir)/rpmqv.c $(COMPILE) -DIAM_RPMDB -o $@ -c rpmqv.c rpmi_SOURCES = -rpmi_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS) -rpmi_LDADD = rpmi.o $(myLDADD) @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@ +#rpmi_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS) +#rpmi_LDADD = rpmi.o $(myLDADD) @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@ +rpmi_LDFLAGS = $(myLDFLAGS) +rpmi_LDADD = rpmi.o $(myLDADD) rpmi.o: $(top_srcdir)/rpmqv.c $(COMPILE) -DIAM_RPMEIU -o $@ -c rpmqv.c diff --git a/autogen.sh b/autogen.sh index fc61b5196..3348b5778 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,20 +3,20 @@ export CFLAGS export LDFLAGS -LTV="libtoolize (GNU libtool) 1.4.3" +LTV="libtoolize (GNU libtool) 1.5" ACV="autoconf (GNU Autoconf) 2.57" -AMV="automake (GNU automake) 1.7.5" +AMV="automake (GNU automake) 1.7.8" USAGE=" This script documents the versions of the tools I'm using to build rpm: - libtool-1.4.3 + libtool-1.5 autoconf-2.57 - automake-1.7.5 + automake-1.7.8 Simply edit this script to change the libtool/autoconf/automake versions checked if you need to, as rpm should build (and has built) with all recent versions of libtool/autoconf/automake. " -[ "`libtoolize --version`" != "$LTV" ] && echo "$USAGE" && exit 1 +[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" && exit 1 [ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" && exit 1 [ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" && exit 1 diff --git a/beecrypt/system.h b/beecrypt/system.h index 297397a07..777603002 100644 --- a/beecrypt/system.h +++ b/beecrypt/system.h @@ -23,10 +23,12 @@ /* XXX from /usr/include/bits/sigest.h in glibc-2.2.4 */ /*@-sizeoftype@*/ # define _SIGSET_NWORDS (1024 / (8 * sizeof (unsigned long int))) +/*@-redef@*/ typedef struct { unsigned long int __val[_SIGSET_NWORDS]; } __sigset_t; +/*@=redef@*/ /*@=sizeoftype@*/ #endif diff --git a/build/Makefile.am b/build/Makefile.am index 88f090a6c..c9bcc0a8e 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -29,7 +29,7 @@ librpmbuild_la_SOURCES = \ parseBuildInstallClean.c parseChangelog.c parseDescription.c \ parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \ parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c -librpmbuild_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \ +librpmbuild_la_LDFLAGS = -release 4.3 $(LDFLAGS) \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ diff --git a/configure.ac b/configure.ac index 56b01adc3..7396ec500 100644 --- a/configure.ac +++ b/configure.ac @@ -23,9 +23,9 @@ echo " * * * This is source code from the development branch of rpm-4.3. * * * -* If you want the "production" rpm-4.2 code, then you should * -* use an rpm-4.1.1 or rpm-4.2 src.rpm. Alternatively, if using a * -* CVS checkout, do the following: * +* If you want the "production" rpm-4.2.1 code, then you should use a * +* rpm-4.2.1 src.rpm. Alternatively, if using a CVS checkout, do * +* the following: * * * * cvs -d :pserver:anonymous@cvs.rpm.org:/cvs/devel login * * (no password, just carriage return) * @@ -787,11 +787,11 @@ AC_TRY_LINK([#include <time.h>],printf("%ld", timezone), AC_MSG_RESULT($HAS_TIMEZONE) dnl Check for missing typedefs +AC_TYPE_MODE_T AC_TYPE_OFF_T AC_TYPE_PID_T -AC_TYPE_MODE_T AC_TYPE_SIZE_T -AC_STRUCT_ST_RDEV +AC_TYPE_ST_RDEV_T dnl Checks for library functions. AC_FUNC_ALLOCA @@ -890,28 +890,41 @@ AC_ARG_WITH(python, [ --with-python build rpm python bindings ]) WITH_PYTHON_VERSION=$withval if test $withval = auto ; then - AC_MSG_CHECKING(for python 2.2) - AC_TRY_RUN([ -#include <python2.2/Python.h> +AC_MSG_CHECKING(for python 2.3) +AC_TRY_RUN([ +#include <python2.3/Python.h> main() { - exit(strncmp("2.2", PY_VERSION, 3)); + exit(strncmp("2.3", PY_VERSION, 3)); } ], withval=yes, withval=no, withval=yes) AC_MSG_RESULT($withval) if test $withval = yes ; then - WITH_PYTHON_VERSION="2.2" + WITH_PYTHON_VERSION="2.3" else - - AC_MSG_CHECKING(for python 1.5.2) + + AC_MSG_CHECKING(for python 2.2) AC_TRY_RUN([ -#include <python1.5/Python.h> -main() { - exit(strcmp("1.5.2", PY_VERSION)); -} ], + #include <python2.2/Python.h> + main() { + exit(strncmp("2.2", PY_VERSION, 3)); + } ], withval=yes, withval=no, withval=yes) AC_MSG_RESULT($withval) if test $withval = yes ; then - WITH_PYTHON_VERSION="1.5" + WITH_PYTHON_VERSION="2.2" + else + + AC_MSG_CHECKING(for python 1.5.2) + AC_TRY_RUN([ + #include <python1.5/Python.h> + main() { + exit(strcmp("1.5.2", PY_VERSION)); + } ], + withval=yes, withval=no, withval=yes) + AC_MSG_RESULT($withval) + if test $withval = yes ; then + WITH_PYTHON_VERSION="1.5" + fi fi fi diff --git a/elfutils/config.guess b/elfutils/config.guess index dff9e481b..2fc3acce2 100755 --- a/elfutils/config.guess +++ b/elfutils/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2001-09-04' +timestamp='2003-06-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,8 +24,9 @@ timestamp='2001-09-04' # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner <bothner@cygnus.com>. -# Please send patches to <config-patches@gnu.org>. +# Originally written by Per Bothner <per@bothner.com>. +# Please send patches to <config-patches@gnu.org>. Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -87,30 +88,42 @@ if test $# != 0; then exit 1 fi +trap 'exit 1' 1 2 15 -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. -# CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int dummy(){}" > $dummy.c ; - for c in cc gcc c89 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; - if test $? = 0 ; then +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -123,33 +136,41 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +## for Red Hat Linux +if test -f /etc/redhat-release ; then + VENDOR=redhat ; +else + VENDOR= ; +fi + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # Netbsd (nbsd) targets should (where applicable) match one or + # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null @@ -166,75 +187,112 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mipseb-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` fi + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <<EOF >$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - eval $set_cc_for_build - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - esac - fi - rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -247,29 +305,11 @@ EOF Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -291,6 +331,13 @@ EOF NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; + esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -319,7 +366,7 @@ EOF echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -333,12 +380,6 @@ EOF aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - sparc*:NetBSD:*) - echo `uname -p`-unknown-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -365,18 +406,6 @@ EOF *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -415,15 +444,20 @@ EOF exit (-1); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; @@ -496,8 +530,7 @@ EOF exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -506,7 +539,7 @@ EOF fi exit 0 ;; *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else @@ -546,10 +579,8 @@ EOF 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - case "${HPUX_REV}" in - 11.[0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -558,13 +589,13 @@ EOF case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac - fi ;; - esac - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include <stdlib.h> @@ -597,11 +628,21 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -635,8 +676,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -664,9 +704,6 @@ EOF parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; - hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -685,9 +722,6 @@ EOF C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; @@ -700,27 +734,21 @@ EOF CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; + *:UNICOS/mp:*:*) + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -730,11 +758,19 @@ EOF *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) + # Determine whether the default compiler uses glibc. + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include <features.h> + #if __GLIBC__ >= 2 + LIBC=gnu + #else + LIBC= + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -745,11 +781,17 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix + echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin @@ -769,23 +811,58 @@ EOF arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux + echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) - case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in - big) echo mips-unknown-linux-gnu && exit 0 ;; - little) echo mipsel-unknown-linux-gnu && exit 0 ;; - esac + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-${VENDOR:-unknown}-linux-gnu exit 0 ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-${VENDOR:-unknown}-linux-gnu exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -813,7 +890,10 @@ EOF echo hppa64-unknown-linux-gnu exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu + exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -822,13 +902,14 @@ EOF echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo x86_64-${VENDOR:-unknown}-linux-gnu exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - ld_supported_targets=`cd /; ld --help 2>&1 \ + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// @@ -840,7 +921,7 @@ EOF ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; @@ -852,32 +933,28 @@ EOF esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build - cat >$dummy.c <<EOF -#include <features.h> -#ifdef __cplusplus -#include <stdio.h> /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-pc-linux-gnu\n", argv[1]); -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-pc-linux-gnuaout\n", argv[1]); -#endif - return 0; -} + sed 's/^ //' << EOF >$dummy.c + #include <features.h> + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) @@ -894,6 +971,23 @@ EOF # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -915,22 +1009,19 @@ EOF UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` echo ${UNAME_MACHINE}-pc-isc$UNAME_REL elif /bin/uname -X 2>/dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -954,9 +1045,15 @@ EOF # "miniframe" echo m68010-convergent-sysv exit 0 ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -973,9 +1070,6 @@ EOF mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1047,6 +1141,9 @@ EOF SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; @@ -1054,18 +1151,24 @@ EOF echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + case `uname -p` in + *86) UNAME_PROCESSOR=i686 ;; + powerpc) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo `uname -p`-${UNAME_MACHINE}-nto-qnx + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[KW]:NONSTOP_KERNEL:*:*) + NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1088,11 +1191,6 @@ EOF fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit 0 ;; @@ -1111,11 +1209,8 @@ EOF *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; esac @@ -1237,8 +1332,7 @@ main () } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 -rm -f $dummy.c $dummy +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. diff --git a/elfutils/config.sub b/elfutils/config.sub index 393f13d37..7cee3d6ec 100755 --- a/elfutils/config.sub +++ b/elfutils/config.sub @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2001-09-07' +timestamp='2003-06-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -29,7 +29,8 @@ timestamp='2001-09-07' # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Please send patches to <config-patches@gnu.org>. +# Please send patches to <config-patches@gnu.org>. Submit a context +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -117,7 +118,7 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) + nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -226,32 +227,45 @@ case $basic_machine in 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ - | d10v | d30v | dsp16xx \ - | fr30 \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ + | ip2k \ | m32r | m68000 | m68k | m88k | mcore \ - | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el | mips64vr4300 \ - | mips64vr4300el | mips64vr5000 | mips64vr5000el \ - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ - | mipsisa32 \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | msp430 \ | ns16k | ns32k \ - | openrisc \ + | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | s390 | s390x \ - | sh | sh[34] | sh[34]eb | shbe | shle \ - | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ - | stormy16 | strongarm \ - | tahoe | thumb | tic80 | tron \ - | v850 \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ | we32k \ - | x86 | xscale \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -278,38 +292,56 @@ case $basic_machine in 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alphapca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armv*-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c54x-* \ - | clipper-* | cray2-* | cydra-* \ - | d10v-* | d30v-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* \ | m32r-* \ - | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ - | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ - | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | msp430-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ | s390-* | s390x-* \ - | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ - | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ - | v850-* | vax-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -343,6 +375,9 @@ case $basic_machine in basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -374,6 +409,10 @@ case $basic_machine in basic_machine=ns32k-sequent os=-dynix ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -394,16 +433,8 @@ case $basic_machine in basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray - os=-unicos - ;; - cray2) - basic_machine=cray2-cray - os=-unicos - ;; - [cjt]90) - basic_machine=${basic_machine}-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; crds | unos) @@ -418,6 +449,14 @@ case $basic_machine in decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -598,14 +637,6 @@ case $basic_machine in basic_machine=m68k-atari os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -620,6 +651,10 @@ case $basic_machine in basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos @@ -692,6 +727,10 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -699,6 +738,10 @@ case $basic_machine in basic_machine=hppa1.1-oki os=-proelf ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -721,49 +764,55 @@ case $basic_machine in pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexgen) + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86 | athlon) + pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-*) + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown - ;; + ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown - ;; + ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; @@ -788,6 +837,16 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -795,7 +854,10 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -862,19 +924,35 @@ case $basic_machine in os=-dynix ;; t3e) - basic_machine=t3e-cray + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; @@ -899,8 +977,8 @@ case $basic_machine in os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -921,17 +999,13 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt + xps | xps100) + basic_machine=xps100-honeywell ;; - xmp) - basic_machine=xmp-cray + ymp) + basic_machine=ymp-cray os=-unicos ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim @@ -952,13 +1026,6 @@ case $basic_machine in op60c) basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm ;; @@ -978,13 +1045,16 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; + sh64) + basic_machine=sh64-unknown + ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -999,10 +1069,6 @@ case $basic_machine in pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; @@ -1065,10 +1131,12 @@ case $os in | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos*) + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1080,8 +1148,10 @@ case $os in ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ @@ -1120,14 +1190,20 @@ case $os in -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; -nsk*) os=-nsk @@ -1166,8 +1242,14 @@ case $os in -xenix) os=-xenix ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos ;; -none) ;; @@ -1200,10 +1282,14 @@ case $basic_machine in arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1230,6 +1316,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1293,19 +1382,19 @@ case $basic_machine in *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) @@ -1377,7 +1466,7 @@ case $basic_machine in -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) diff --git a/lib/.splintrc b/lib/.splintrc index c46cc2d0f..9fbcfc566 100644 --- a/lib/.splintrc +++ b/lib/.splintrc @@ -3,7 +3,6 @@ +partial +forcehints -#-warnunixlib -warnposix +unixlib @@ -19,7 +18,7 @@ -redecl -bufferoverflowhigh --nullpass +-nullpass # rpmExpand annoyance # --- +partial artifacts -declundef diff --git a/lib/Makefile.am b/lib/Makefile.am index 0ea79a64a..fe7136ce8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -37,7 +37,7 @@ librpm_la_SOURCES = \ rpmlead.c rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c rpmvercmp.c \ signature.c stringbuf.c transaction.c \ verify.c -librpm_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \ +librpm_la_LDFLAGS = -release 4.3 $(LDFLAGS) \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ $(top_builddir)/popt/libpopt.la diff --git a/lib/depends.c b/lib/depends.c index dd5cbba83..df8be9253 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -78,8 +78,8 @@ static int intcmp(const void * a, const void * b) */ static int removePackage(rpmts ts, Header h, int dboffset, /*@exposed@*/ /*@dependent@*/ /*@null@*/ alKey depends) - /*@globals fileSystem @*/ - /*@modifies ts, h, fileSystem @*/ + /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ + /*@modifies ts, h, rpmGlobalMacroContext, fileSystem @*/ { rpmte p; @@ -1620,7 +1620,7 @@ int rpmtsCheck(rpmts ts) rpmds provides; /*@-nullpass@*/ /* FIX: rpmts{A,O} can return null. */ - rpmMessage(RPMMESS_DEBUG, "========== +++ %s %s/%s 0x%x\n", + rpmMessage(RPMMESS_DEBUG, "========== +++ %s %s/%s 0x%x\n", rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p)); /*@=nullpass@*/ rc = checkPackageDeps(ts, rpmteNEVR(p), @@ -1631,19 +1631,10 @@ int rpmtsCheck(rpmts ts) if (rc) goto exit; -#if defined(DYING) || defined(__LCLINT__) - /* XXX all packages now have Provides: name = version-release */ - /* Adding: check name against conflicts matches. */ - rc = checkDependentConflicts(ts, rpmteN(p)); - if (rc) - goto exit; -#endif - rc = 0; provides = rpmteDS(p, RPMTAG_PROVIDENAME); provides = rpmdsInit(provides); - if (provides == NULL || rpmdsN(provides) == NULL) - continue; + if (provides != NULL) while (rpmdsNext(provides) >= 0) { const char * Name; @@ -1670,7 +1661,7 @@ int rpmtsCheck(rpmts ts) rpmfi fi; /*@-nullpass@*/ /* FIX: rpmts{A,O} can return null. */ - rpmMessage(RPMMESS_DEBUG, "========== --- %s %s/%s 0x%x\n", + rpmMessage(RPMMESS_DEBUG, "========== --- %s %s/%s 0x%x\n", rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p)); /*@=nullpass@*/ diff --git a/lib/formats.c b/lib/formats.c index b86a5a054..c86ffb459 100644 --- a/lib/formats.c +++ b/lib/formats.c @@ -829,8 +829,9 @@ static int filenamesTag(Header h, /*@out@*/ rpmTagType * type, static int fileclassTag(Header h, /*@out@*/ rpmTagType * type, /*@out@*/ const void ** data, /*@out@*/ int_32 * count, /*@out@*/ int * freeData) - /*@globals fileSystem @*/ - /*@modifies h, *type, *data, *count, *freeData, fileSystem @*/ + /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ + /*@modifies h, *type, *data, *count, *freeData, + rpmGlobalMacroContext, fileSystem @*/ /*@requires maxSet(type) >= 0 /\ maxSet(data) >= 0 /\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/ { @@ -852,8 +853,9 @@ static int fileclassTag(Header h, /*@out@*/ rpmTagType * type, static int fileprovideTag(Header h, /*@out@*/ rpmTagType * type, /*@out@*/ const void ** data, /*@out@*/ int_32 * count, /*@out@*/ int * freeData) - /*@globals fileSystem @*/ - /*@modifies h, *type, *data, *count, *freeData, fileSystem @*/ + /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ + /*@modifies h, *type, *data, *count, *freeData, + rpmGlobalMacroContext, fileSystem @*/ /*@requires maxSet(type) >= 0 /\ maxSet(data) >= 0 /\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/ { @@ -875,8 +877,9 @@ static int fileprovideTag(Header h, /*@out@*/ rpmTagType * type, static int filerequireTag(Header h, /*@out@*/ rpmTagType * type, /*@out@*/ const void ** data, /*@out@*/ int_32 * count, /*@out@*/ int * freeData) - /*@globals fileSystem @*/ - /*@modifies h, *type, *data, *count, *freeData, fileSystem @*/ + /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ + /*@modifies h, *type, *data, *count, *freeData, + rpmGlobalMacroContext, fileSystem @*/ /*@requires maxSet(type) >= 0 /\ maxSet(data) >= 0 /\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/ { diff --git a/lib/rpmcli.h b/lib/rpmcli.h index 28b7b65a9..b64ae1e70 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h @@ -354,8 +354,8 @@ int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg) * @return 0 always */ int showQueryPackage(QVA_t qva, rpmts ts, Header h) - /*@globals fileSystem, internalState @*/ - /*@modifies ts, h, fileSystem, internalState @*/; + /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ + /*@modifies ts, h, rpmGlobalMacroContext, fileSystem, internalState @*/; /** \ingroup rpmcli * Display package information. diff --git a/lib/rpmfi.c b/lib/rpmfi.c index 193bd6739..2e616628d 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -659,8 +659,9 @@ Header relocateFileList(const rpmts ts, rpmfi fi, int_32 fileCount; int_32 dirCount; uint_32 * fFlags = NULL; + uint_32 * fColors = NULL; + uint_32 * dColors = NULL; uint_16 * fModes = NULL; - char * skipDirList; Header h; int nrelocated = 0; int fileAlloced = 0; @@ -829,10 +830,11 @@ assert(p != NULL); xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL); xx = hge(h, RPMTAG_DIRNAMES, NULL, (void **) &dirNames, &dirCount); xx = hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fFlags, NULL); + xx = hge(h, RPMTAG_FILECOLORS, NULL, (void **) &fColors, NULL); xx = hge(h, RPMTAG_FILEMODES, NULL, (void **) &fModes, NULL); - skipDirList = alloca(dirCount * sizeof(*skipDirList)); - memset(skipDirList, 0, dirCount * sizeof(*skipDirList)); + dColors = alloca(dirCount * sizeof(*dColors)); + memset(dColors, 0, dirCount * sizeof(*dColors)); newDirIndexes = alloca(sizeof(*newDirIndexes) * fileCount); memcpy(newDirIndexes, dirIndexes, sizeof(*newDirIndexes) * fileCount); @@ -859,11 +861,12 @@ assert(p != NULL); } /*@=branchstate@*/ - if (fn == NULL) /* XXX can't happen */ - continue; +assert(fn != NULL); /* XXX can't happen */ *fn = '\0'; fnlen = stpcpy( stpcpy(fn, dirNames[dirIndexes[i]]), baseNames[i]) - fn; +if (fColors != NULL) +dColors[dirIndexes[i]] |= fColors[i]; /* * See if this file path needs relocating. */ @@ -910,8 +913,6 @@ assert(p != NULL); /*@innercontinue@*/ continue; /*@innerbreak@*/ break; } - if (j < dirCount) - skipDirList[j] = 1; } if (actions) { actions[i] = FA_SKIPNSTATE; @@ -981,6 +982,11 @@ assert(p != NULL); for (i = dirCount - 1; i >= 0; i--) { for (j = numRelocations - 1; j >= 0; j--) { + /* XXX Don't autorelocate uncolored directories. */ + if (j == p->autorelocatex + && (dColors[i] == 0 || !(dColors[i] & 0x1))) + /*@innercontinue@*/ continue; + if (relocations[j].oldPath == NULL) /* XXX can't happen */ /*@innercontinue@*/ continue; len = strcmp(relocations[j].oldPath, "/") @@ -1295,42 +1301,54 @@ if (fi->actions == NULL) if (ts != NULL) if (fi != NULL) - if ((p = rpmtsRelocateElement(ts)) != NULL && rpmteType(p) == TR_ADDED) { + if ((p = rpmtsRelocateElement(ts)) != NULL && rpmteType(p) == TR_ADDED + && !headerIsEntry(h, RPMTAG_SOURCEPACKAGE) + && !headerIsEntry(h, RPMTAG_ORIGBASENAMES)) + { const char * fmt = rpmGetPath("%{?_autorelocate_path}", NULL); const char * errstr; char * newPath; - const char * march = NULL; - const char * harch = NULL; Header foo; - /* XXX add os (or platform) checks. */ - rpmGetArchInfo(&march, NULL); - /* XXX error handling. */ newPath = headerSprintf(h, fmt, rpmTagTable, rpmHeaderFormats, &errstr); fmt = _free(fmt); - if (newPath != NULL && *newPath != '\0' - && hge(h, RPMTAG_ARCH, NULL, (void **) &harch, NULL) - && harch != NULL && !rpmMachineScore(RPM_MACHTABLE_INSTARCH, harch) ) - { - #if __ia64__ - /* XXX On ia64, change leading /emul/ix86 -> /emul/ia32, ick. */ - if (strlen(newPath) >= (sizeof("/emul/i386")-1) - && newPath[0] == '/' && newPath[1] == 'e' && newPath[2] == 'm' - && newPath[3] == 'u' && newPath[4] == 'l' && newPath[5] == '/' - && newPath[6] == 'i' && newPath[8] == '8' && newPath[9] == '6') - { - newPath[7] = 'a'; - newPath[8] = '3'; - newPath[9] = '2'; - } + /* XXX On ia64, change leading /emul/ix86 -> /emul/ia32, ick. */ + if (newPath != NULL && *newPath != '\0' + && strlen(newPath) >= (sizeof("/emul/i386")-1) + && newPath[0] == '/' && newPath[1] == 'e' && newPath[2] == 'm' + && newPath[3] == 'u' && newPath[4] == 'l' && newPath[5] == '/' + && newPath[6] == 'i' && newPath[8] == '8' && newPath[9] == '6') + { + newPath[7] = 'a'; + newPath[8] = '3'; + newPath[9] = '2'; + } #endif + + /* XXX Make sure autoreloc is not already specified. */ + i = p->nrelocs; + if (newPath != NULL && *newPath != '\0' && p->relocs != NULL) + for (i = 0; i < p->nrelocs; i++) { + if (strcmp(p->relocs[i].oldPath, "/")) + continue; + if (strcmp(p->relocs[i].newPath, newPath)) + continue; + break; + } + + /* XXX test for incompatible arch triggering autorelocation is dumb. */ + if (newPath != NULL && *newPath != '\0' && i == p->nrelocs + && p->archScore == 0) + { + p->relocs = xrealloc(p->relocs, (p->nrelocs + 2) * sizeof(*p->relocs)); p->relocs[p->nrelocs].oldPath = xstrdup("/"); p->relocs[p->nrelocs].newPath = xstrdup(newPath); + p->autorelocatex = p->nrelocs; p->nrelocs++; p->relocs[p->nrelocs].oldPath = NULL; p->relocs[p->nrelocs].newPath = NULL; diff --git a/lib/rpmfi.h b/lib/rpmfi.h index cdfbbbcdf..d4456d3ac 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -496,8 +496,8 @@ rpmfi rpmfiFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi) */ /*@null@*/ rpmfi rpmfiNew(/*@null@*/ rpmts ts, Header h, rpmTag tagN, int scareMem) - /*@globals fileSystem @*/ - /*@modifies ts, h, fileSystem @*/; + /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ + /*@modifies ts, h, rpmGlobalMacroContext, fileSystem @*/; /** * Retrieve file classes from header. @@ -510,8 +510,8 @@ rpmfi rpmfiNew(/*@null@*/ rpmts ts, Header h, rpmTag tagN, int scareMem) */ void rpmfiBuildFClasses(Header h, /*@out@*/ const char *** fclassp, /*@out@*/ int * fcp) - /*@globals fileSystem @*/ - /*@modifies h, *fclassp, *fcp, fileSystem @*/; + /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ + /*@modifies h, *fclassp, *fcp, rpmGlobalMacroContext, fileSystem @*/; /** * Retrieve per-file dependencies from header. @@ -525,8 +525,8 @@ void rpmfiBuildFClasses(Header h, */ void rpmfiBuildFDeps(Header h, rpmTag tagN, /*@out@*/ const char *** fdepsp, /*@out@*/ int * fcp) - /*@globals fileSystem @*/ - /*@modifies h, *fdepsp, *fcp, fileSystem @*/; + /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ + /*@modifies h, *fdepsp, *fcp, rpmGlobalMacroContext, fileSystem @*/; /** * Return file type from mode_t. @@ -553,7 +553,7 @@ int rpmfiCompare(const rpmfi afi, const rpmfi bfi) * @return file dispostion */ fileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing) - /*@globals fileSystem, internalState @*/ + /*@globals h_errno, fileSystem, internalState @*/ /*@modifies nfi, fileSystem, internalState @*/; /** diff --git a/lib/rpminstall.c b/lib/rpminstall.c index d978fdafc..7593ec4b6 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -787,7 +787,7 @@ int rpmErase(rpmts ts, struct rpmInstallArguments_s * ia, rpmMessage(RPMMESS_ERROR, _("\"%s\" specifies multiple packages\n"), *arg); numFailed++; - break; + /*@innerbreak@*/ break; } if (recOffset) { (void) rpmtsAddEraseElement(ts, h, recOffset); diff --git a/lib/rpmte.c b/lib/rpmte.c index fc9f9bb19..fe8eff6fe 100644 --- a/lib/rpmte.c +++ b/lib/rpmte.c @@ -85,8 +85,8 @@ static void delTE(rpmte p) static void addTE(rpmts ts, rpmte p, Header h, /*@dependent@*/ /*@null@*/ fnpyKey key, /*@null@*/ rpmRelocation * relocs) - /*@globals fileSystem @*/ - /*@modifies ts, p, h, fileSystem @*/ + /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ + /*@modifies ts, p, h, rpmGlobalMacroContext, fileSystem @*/ { int scareMem = 0; HGE_t hge = (HGE_t)headerGetEntryMinMemory; @@ -106,10 +106,22 @@ static void addTE(rpmts ts, rpmte p, Header h, arch = NULL; xx = hge(h, RPMTAG_ARCH, NULL, (void **)&arch, NULL); - p->arch = (arch != NULL ? xstrdup(arch) : NULL); + if (arch != NULL) { + p->arch = xstrdup(arch); + p->archScore = rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch); + } else { + p->arch = NULL; + p->archScore = 0; + } os = NULL; xx = hge(h, RPMTAG_OS, NULL, (void **)&os, NULL); - p->os = (os != NULL ? xstrdup(os) : NULL); + if (os != NULL) { + p->os = xstrdup(os); + p->osScore = rpmMachineScore(RPM_MACHTABLE_INSTOS, os); + } else { + p->os = NULL; + p->osScore = 0; + } nb = strlen(p->NEVR) + 1; if (p->arch) @@ -148,6 +160,7 @@ static void addTE(rpmts ts, rpmte p, Header h, p->relocs[i].oldPath = NULL; p->relocs[i].newPath = NULL; } + p->autorelocatex = -1; p->key = key; p->fd = NULL; @@ -193,10 +206,10 @@ rpmte rpmteNew(const rpmts ts, Header h, int_32 * ep; int xx; + p->type = type; addTE(ts, p, h, key, relocs); switch (type) { case TR_ADDED: - p->type = type; p->u.addedKey = pkgKey; ep = NULL; xx = headerGetEntry(h, RPMTAG_SIGSIZE, NULL, (void **)&ep, NULL); @@ -205,7 +218,6 @@ rpmte rpmteNew(const rpmts ts, Header h, p->pkgFileSize += 96 + 256 + *ep; break; case TR_REMOVED: - p->type = type; p->u.removed.dependsOnKey = pkgKey; p->u.removed.dboffset = dboffset; break; diff --git a/lib/rpmte.h b/lib/rpmte.h index 50bbcb2d1..5648c5804 100644 --- a/lib/rpmte.h +++ b/lib/rpmte.h @@ -77,6 +77,8 @@ struct rpmte_s { const char * arch; /*!< Architecture hint. */ /*@only@*/ /*@null@*/ const char * os; /*!< Operating system hint. */ + int archScore; /*!< (TR_ADDED) Arch score. */ + int osScore; /*!< (TR_ADDED) Os score. */ rpmte parent; /*!< Parent transaction element. */ int degree; /*!< No. of immediate children. */ @@ -107,6 +109,7 @@ struct rpmte_s { /*@owned@*/ /*@null@*/ rpmRelocation * relocs; /*!< (TR_ADDED) Payload file relocations. */ int nrelocs; /*!< (TR_ADDED) No. of relocations. */ + int autorelocatex; /*!< (TR_ADDED) Auto relocation entry index. */ /*@refcounted@*/ /*@null@*/ FD_t fd; /*!< (TR_ADDED) Payload file descriptor. */ @@ -168,8 +171,8 @@ rpmte rpmteNew(const rpmts ts, Header h, rpmElementType type, /*@null@*/ rpmRelocation * relocs, int dboffset, /*@exposed@*/ /*@dependent@*/ /*@null@*/ alKey pkgKey) - /*@globals fileSystem @*/ - /*@modifies ts, h, fileSystem @*/; + /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ + /*@modifies ts, h, rpmGlobalMacroContext, fileSystem @*/; /** * Retrieve type of transaction element. diff --git a/lib/rpmts.c b/lib/rpmts.c index 9f23790d3..cb98fc2d1 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -185,10 +185,13 @@ int rpmtsVerifyDB(rpmts ts) return rpmdbVerify(ts->rootDir); } +/*@-boundsread@*/ static int isArch(const char * arch) /*@*/ { const char ** av; +/*@-nullassign@*/ + /*@observer@*/ static const char *arches[] = { "i386", "i486", "i586", "i686", "athlon", "x86_64", "alpha", "alphaev5", "alphaev56", "alphapca56", "alphaev6", "alphaev67", @@ -206,6 +209,7 @@ static int isArch(const char * arch) "noarch", NULL, }; +/*@=nullassign@*/ for (av = arches; *av != NULL; av++) { if (!strcmp(arch, *av)) @@ -213,6 +217,7 @@ static int isArch(const char * arch) } return 0; } +/*@=boundsread@*/ rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, const void * keyp, size_t keylen) @@ -225,7 +230,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, return NULL; /* Parse out "N(EVR).A" tokens from a label key. */ -/*@-branchstate@*/ +/*@-bounds -branchstate@*/ if (rpmtag == RPMDBI_LABEL && keyp != NULL) { const char * s = keyp; const char *se; @@ -239,7 +244,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, switch (c) { default: *t++ = c; - break; + /*@switchbreak@*/ break; case '(': /* XXX Fail if nested parens. */ if (level++ != 0) { @@ -248,7 +253,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, } /* Parse explicit epoch. */ for (se = s; *se && xisdigit(*se); se++) - ; + {}; if (*se == ':') { /* XXX skip explicit epoch's (for now) */ *t++ = '-'; @@ -257,7 +262,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, /* No Epoch: found. Convert '(' to '-' and chug. */ *t++ = '-'; } - break; + /*@switchbreak@*/ break; case ')': /* XXX Fail if nested parens. */ if (--level != 0) { @@ -265,7 +270,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, return NULL; } /* Don't copy trailing ')' */ - break; + /*@switchbreak@*/ break; } } if (level) { @@ -281,7 +286,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, arch = t; } } -/*@=branchstate@*/ +/*@=bounds =branchstate@*/ mi = rpmdbInitIterator(ts->rdb, rpmtag, keyp, keylen); diff --git a/lib/rpmts.h b/lib/rpmts.h index 0bd3fdfb5..4cea1654a 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -889,8 +889,8 @@ int rpmtsAddInstallElement(rpmts ts, Header h, * @return 0 on success */ int rpmtsAddEraseElement(rpmts ts, Header h, int dboffset) - /*@globals fileSystem @*/ - /*@modifies ts, h, fileSystem @*/; + /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ + /*@modifies ts, h, rpmGlobalMacroContext, fileSystem @*/; /** \ingroup rpmts * Retrieve keys from ordered transaction set. diff --git a/lib/transaction.c b/lib/transaction.c index 1806ed08a..a0e147d7e 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -1414,7 +1414,9 @@ assert(psm != NULL); pkgKey = rpmteAddedKey(p); - rpmMessage(RPMMESS_DEBUG, "========== +++ %s\n", rpmteNEVR(p)); + rpmMessage(RPMMESS_DEBUG, "========== +++ %s %s-%s 0x%x\n", + rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p)); + p->h = NULL; /*@-type@*/ /* FIX: rpmte not opaque */ { @@ -1514,7 +1516,9 @@ assert(psm != NULL); case TR_REMOVED: (void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_ERASE), 0); - rpmMessage(RPMMESS_DEBUG, "========== --- %s\n", rpmteNEVR(p)); + rpmMessage(RPMMESS_DEBUG, "========== --- %s %s-%s 0x%x\n", + rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p)); + /* * XXX This has always been a hack, now mostly broken. * If install failed, then we shouldn't erase. diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 62f1a8cb6..a4b679f8e 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` +mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/mkinstalldirs" ;; esac` CC = @CC@ GMSGFMT = @GMSGFMT@ @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -109,7 +109,7 @@ msgstr "Spoleèné volby pro v¹echny módy:" msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM verze %s\n" @@ -344,27 +344,27 @@ msgstr "pro kontrolu nezadány ¾ádné balíèky" msgid "no arguments given" msgstr "k dotazu nezadány ¾ádné parametry" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "Nelze otevøít doèasný soubor.\n" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "Provádìní(%s): %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "Spu¹tìní %s selhalo (%s): %s\n" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "©patný návratový kód z %s (%s)\n" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" @@ -374,244 +374,244 @@ msgstr "" "\n" "chyby sestavení RPM:\n" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "chyba syntaxe pøi zpracování ==\n" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "chyba syntaxe pøi zpracování &&\n" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "chyba syntaxe pøi zpracování ||\n" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "chyba pøi parsování ve výrazu\n" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "nedoplnìná (\n" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "- jen na èíslech\n" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "! jen na èíslech\n" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "typy musí souhlasit\n" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "* / nejsou podporovány pro øetìzce\n" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "- není podporováno pro øetìzce\n" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "&& a || není podporováno pro øetìzce\n" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "chyba syntaxe ve výrazu\n" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK selhal: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "Chybí '(' v %s %s\n" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "Chybí ')' v %s(%s\n" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "Neplatný %s token: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, c-format msgid "Missing %s in %s %s\n" msgstr "Chybìjící %s v %s %s\n" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "Následuje neprázdný znak %s(): %s\n" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "©patná syntaxe: %s(%s)\n" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "©patná práva spec: %s(%s)\n" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "©patná práva adresáøe: %s(%s)\n" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Neobvyklá délka locale: \"%.*s\" v %%lang(%s)\n" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Duplicitní locale %.*s v %%lang(%s)\n" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "Dosa¾en limit pro %%docdir\n" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "Jen jeden parametr pro %%docdir\n" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "Dva soubory na jednom øádku: %s\n" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "Soubor musí zaèínat na \"/\": %s\n" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Nelze míchat speciální %%doc s ostatnímí formami: %s\n" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "Soubor uveden dvakrát: %s\n" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolická linka ukazuje na BuildRoot: %s -> %s\n" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Soubor nesouhlasí s prefixem (%s): %s\n" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "Soubor nenalezen: %s\n" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: readLead selhalo\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Soubor potøebuje úvodní \"/\": %s\n" -#: build/files.c:1839 +#: build/files.c:1828 #, c-format msgid "Glob not permitted: %s\n" msgstr "Glob není dovolen: %s\n" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "Soubor nenalezen globem: %s\n" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Nemohu otevøít %%files soubor %s: %s\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "øádek: %s\n" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "©patný soubor: %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "©patný vlastník/skupina: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Zpracovávám soubory: %s-%s-%s\n" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "getUname: pøíli¹ mnoho UID\n" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "getUnameS: pøíli¹ mnoho UID\n" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "getUidS: pøíli¹ mnoho UID\n" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "getGname: pøíli¹ mnoho GID\n" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "getGnameS: pøíli¹ mnoho GID\n" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "getGidS: pøíli¹ mnoho GID\n" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "Nemohu získat jméno poèítaèe: %s\n" @@ -725,7 +725,7 @@ msgstr "Nemohu pøeèíst hlavièku z %s: %s\n" msgid "Could not open %s: %s\n" msgstr "Nemohu otevøít %s: %s\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "Nemohu zapsat balíèek: %s\n" @@ -755,7 +755,7 @@ msgstr "Nemohu pøeèíst payload z %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Nemohu zapsat payload do %s: %s\n" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -815,17 +815,17 @@ msgstr "øádek %d: Chyba pøi parsování %%description: %s\n" msgid "line %d: Bad option %s: %s\n" msgstr "øádek %d: ¹patná volba %s: %s\n" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "øádek %d: Pøíli¹ mnoho jmen: %s\n" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "øádek %d: Balíèek neexistuje: %s\n" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "øádek %d: Druhé description\n" @@ -906,7 +906,7 @@ msgstr "øádek %d: Prázdná znaèka: %s\n" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "øádek %d: Nepøípustný znak '-' v %s: %s\n" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "BuildRoot nemù¾e být \"/\": %s\n" @@ -1088,31 +1088,31 @@ msgstr "Nemohu otevøít %s: %s\n" msgid "Unclosed %%if\n" msgstr "Neuzavøený %%if\n" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "%s:%d: parseExpressionBoolean vrátil %d\n" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "%s:%d: %%else bez poèíteèního %%if\n" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "%s:%d: %%endif bez poèáteèního %%if\n" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "po¹kozený pøíkaz %%include\n" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 msgid "No compatible architectures found for build\n" msgstr "Nenalezeny ¾ádné kompatibilní architektury pro sestavení\n" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "Balíèek nemá ¾ádné %%description: %s\n" @@ -1242,19 +1242,19 @@ msgstr "nekontrolovat závislosti balíèkù" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "generovat hlavièky balíèkù kompatibilní s RPM verze 2 a 3" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "nekontrolovat závislosti balíèkù" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "nekontrolovat architekturu balíèku" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1350,7 +1350,7 @@ msgstr "Interní chyba" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr "selhal - " @@ -1359,52 +1359,52 @@ msgstr "selhal - " msgid "package %s was already added, replacing with %s\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:438 +#: lib/depends.c:441 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "©patný soubor: %s: %s\n" -#: lib/depends.c:480 +#: lib/depends.c:483 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1412,27 +1412,27 @@ msgid "" msgstr "" "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(není èíslo)" @@ -1445,91 +1445,91 @@ msgstr "(není èíslo)" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 #, fuzzy msgid "(not a blob)" msgstr "(není èíslo)" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "vynechat pøípadné PGP podpisy" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() nevrátil velikost: %s\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() nevrátil pøípojné body: %s\n" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "nemohu zjistit stav %s: %s\n" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "Soubor %4d: %07o %s.%s\t %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "soubor %s je na neznámém zaøízení\n" -#: lib/fsm.c:341 +#: lib/fsm.c:350 #, fuzzy -msgid "========== Directories not explictly included in package:\n" +msgid "========== Directories not explicitly included in package:\n" msgstr "========= Adresáøe, které nebyly explicitnì zaøazeny do balíèku:\n" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "vytvoøen adresáø %s s právy %04o.\n" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "%s ulo¾eno jako %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s odstranìní %s selhalo: Adresáø není prázdný\n" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir %s selhal: %s\n" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink %s selhal: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "%s vytvoøen jako %s\n" @@ -1544,7 +1544,7 @@ msgstr "nemohu vytvoøit %s: %s\n" msgid "cannot write to %%%s %s\n" msgstr "nemohu zapsat do %%%s %s\n" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" @@ -1582,180 +1582,180 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "práce s balíèky verze 1 není podporována touto verzí RPM\n" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "tato verze RPM podporuje práci s balíèky s verzí <= 4\n" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: readLead selhalo\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: readLead selhalo\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread selhalo: %s\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "vypsat expanzi makra <výraz>+" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 #, fuzzy msgid "read <FILE:...> instead of default file(s)" msgstr "èíst <soubor:...> místo implicitního makro souboru" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "zakázat pou¾ití libio(3) API" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "odeslat stdout do <pøíkazu>" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "pou¾ít <adr> jako adresáø nejvy¹¹í úrovnì" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "zobrazit známé znaèky pro dotazy" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "zobrazit finální konfiguraci rpmrc a maker" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "poskytnout výstu s ménì detaily" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "poskytnout detailnìj¹í výstup" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "vypsat pou¾ívanou verzi rpm" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 #, fuzzy msgid "debug payload file state machine" msgstr "ladit nástroj stavu souborù" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "ladit nástroj stavu souborù" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "ladit protokol datového toku" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 #, fuzzy msgid "debug option/argument processing" msgstr "Interní chyba pøi zpracování parametrù (%d) :-(\n" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 #, fuzzy msgid "debug package state machine" msgstr "ladit nástroj stavu souborù" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "ladit nástroj stavu souborù" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "ladit rpmio I/O" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "ladit manipulaci s URL cache" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2190,89 +2190,89 @@ msgstr "podepsat balíèek (zahodit aktuální podpis)" msgid "generate signature" msgstr "generovat PGP/GPG podpis" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "oèekávám balíèek se zdrojovými kódy, nalezen v¹ak binární\n" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "zdrojový balíèek neobsahuje .spec soubor\n" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s obsahuje %d souborù, test = %d\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Nemohu pøeèíst hlavièku z %s: %s\n" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root\n" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr " na souboru " -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "nesprávný formát: %s\n" @@ -2321,7 +2321,7 @@ msgid "package has neither file owner or id lists\n" msgstr "balíèek nemá vlastníka souboru ani seznamy id\n" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2336,71 +2336,76 @@ msgstr "dotaz na %s se nezdaøil\n" msgid "old format source packages cannot be queried\n" msgstr "nelze provést dotaz na zdrojové balíèky starého formátu\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "¾ádný balíèek neaktivuje %s\n" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "¾ádné balíèky\n" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "neznámá znaèka" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s neobsahuje ¾ádné balíèky\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "¾ádný balíèek neaktivuje %s\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "nemohu zjistit stav %s: %s\n" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "¾ádný balíèek neaktivuje %s\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "¾ádný balíèek nevy¾aduje %s\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "¾ádný balíèek neposkytuje %s\n" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "soubor %s: %s\n" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "soubor %s nevlastní ¾ádný balíèek\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "neplatné èíslo balíèku: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "záznam balíèku èíslo: %u\n" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "záznam %u nelze pøeèíst\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" @@ -2424,100 +2429,100 @@ msgstr "%s: otevøení selhalo: %s\n" msgid "makeTempFile failed\n" msgstr "makeTempFile selhalo\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite selhalo: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "parametr není RPM balíèek\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: Fwrite selhalo: %s\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: Fwrite selhalo: %s\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead selhalo\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead selhalo\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead selhalo\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead selhalo\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 #, fuzzy msgid "NOT OK" msgstr "NE " -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr "" -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr "" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "NE " -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "ANO" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2526,43 +2531,48 @@ msgstr "" "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "" + +#: lib/rpmfi.c:783 #, fuzzy msgid "========== relocations\n" msgstr "========== ukládání tsort relací\n" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je vyøazen: %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "%s vytvoøen jako %s\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Provádìní(%s): %s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, fuzzy, c-format msgid "relocating %s to %s\n" msgstr "Provádìní(%s): %s\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "nemohu provést dotaz %s: %s\n" @@ -2615,7 +2625,7 @@ msgstr "%s ulo¾eno jako %s\n" msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "neinstalován " @@ -2635,52 +2645,52 @@ msgstr "chyba pøi vytváøení doèasného souboru %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "vytvoøení zdrojového a binárního balíèku z <tar_soubor>" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "chybné závislosti pøi sestavování:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 #, fuzzy msgid "installing binary packages\n" msgstr "nainstalovat balíèek" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, fuzzy, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "Polo¾ka %s musí být v balíèku pøítomna: %s\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, fuzzy, c-format msgid "Installing %s\n" msgstr "øádek: %s\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "%s: Fread selhalo: %s\n" @@ -2891,36 +2901,51 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Nemohu otevøít %s: %s\n" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít RPM databázi v %s\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "neplatné èíslo balíèku: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "Chybí '(' v %s %s\n" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "neplatné èíslo balíèku: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "nemohu otevøít RPM databázi v %s\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "øádek: %s\n" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "RPM verze %s\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 #, fuzzy msgid "mounted filesystems:\n" msgstr "získávám seznam pøipojených systémù souborù\n" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3057,49 +3082,44 @@ msgstr "" msgid "Header+Payload size: " msgstr "Velikost hlavièky je pøili¹ velká" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "nekontrolovat SHA1 digest v hlavièce" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "vynechat pøípadné MD5 souèty" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "generovat PGP/GPG podpis" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3112,7 +3132,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3125,7 +3145,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3133,16 +3153,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "chybí { po %" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "chybné závislosti pøi sestavování:\n" @@ -3231,71 +3251,80 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "chybí { po %" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "po %{ chybí }" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "prázdný formát znaèky" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "prázdné jméno znaèky" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "neznámá znaèka" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "na konci pole oèekáváno ]" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "neoèekávaná ]" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "neoèekávaná }" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "ve výrazu oèekáván ?" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "ve výrazu je po ? oèekávána {" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "ve výrazu je oèekávána }" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "v podvýrazu je po ? oèekávána :" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "ve výrazu je po : oèekávána {" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "na konci výrazu je oèekáváno |" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3318,176 +3347,176 @@ msgstr "zkontrolovat databázové soubory" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generovat hlavièky balíèkù kompatibilní s RPM verze 2 a 3" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "nemohu otevøít RPM databázi v %s\n" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "nemohu otevøít RPM databázi v %s\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu vytvoøit databázi z existující databáze" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Nelze pøejmenovat %s na %s: %m\n" @@ -3498,147 +3527,147 @@ msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Neznámý typ ikony: %s\n" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Glob není dovolen: %s\n" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "soubor %s: %s\n" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 #, fuzzy msgid "Unable to lookup server host address" msgstr "Nemohu otevøít cíl pro podepsání %s: %s\n" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 #, fuzzy msgid "File not found on server" msgstr "Soubor nenalezen: %s\n" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Unknown or unexpected error" msgstr "neoèekávaný zdroj dotazu" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -109,7 +109,7 @@ msgstr "Fælles tilvalg for alle rpm-tilstande:" msgid "%s: %s\n" msgstr "fil %s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM version %s\n" @@ -339,27 +339,27 @@ msgstr "ingen parametre angivet ved verifikation" msgid "no arguments given" msgstr "ingen parametre angivet ved forespørgsel" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "Kunne ikke åbne midlertidig fil.\n" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "Udfører(%s): %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "Udførelse af %s mislykkedes (%s): %s\n" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "Fejl-afslutningsstatus fra %s (%s)\n" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" @@ -369,246 +369,246 @@ msgstr "" "\n" "RPM opbygningsfejl:\n" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "syntaksfejl under tolkning af ==\n" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "syntaksfejl under tolkning af &&\n" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "syntaksfejl under tolkning af ||\n" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "tolkningsfejl i udtryk\n" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "uparret (\n" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "- kun for tal\n" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "! kun for tal\n" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "typer skal passe sammen\n" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "* / understøttes ikke for strenge\n" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "- understøttes ikke for strenge\n" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "&& og || understøttes ikke for strenge\n" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "syntaksfejl i udtryk\n" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK-fejl: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "Manglende '(' i %s %s\n" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "Manglende ')' i %s %s\n" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "Ugyldigt %s-symbol: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "Manglende '(' i %s %s\n" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "Ikke-mellemrum efterfølger %s(): %s\n" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Ugyldig syntaks: %s(%s)\n" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Ugyldig tilstandsangivelse: %s(%s)\n" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Ugyldig dirmode-spec: %s(%s)\n" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Anormal locale-længde: \"%.*s\" i %%lang(%s)\n" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Dobbelt locale %.*s i %%lang(%s)\n" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "Træfningsgrænse for %%docdir\n" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "Kun et parameter for %%docdir\n" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "To filer på én linie: %s\n" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "Fil skal begynde med \"/\": %s\n" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Kan ikke blande special-%%doc med andre former: %s\n" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "Fil angivet to gange: %s\n" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolsk lænke peger på BuildRoot: %s -> %s\n" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Fil passer ikke til præfiks (%s): %s\n" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "Fil ikke fundet: %s\n" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: readLead mislykkedes\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Fil kræver foranstillet \"/\": %s\n" -#: build/files.c:1839 +#: build/files.c:1828 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linie %d: Filnavn ikke tilladt: %s\n" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "Fil ikke fundet med glob: %s\n" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åbne '%%files'-fil %s: %s\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "linie: %s\n" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ugyldig fil: %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Ugyldig ejer/gruppe: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Gennemløber filer: %s-%s-%s\n" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "getUname: for mange uid'er\n" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "getUnameS: for mange uid'er\n" -#: build/names.c:102 +#: build/names.c:111 #, fuzzy msgid "getUidS: too many uid's\n" msgstr "getUnameS: for mange uid'er\n" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "getGname: for mange gid'er\n" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "getGnameS: for mange gid'er\n" -#: build/names.c:174 +#: build/names.c:195 #, fuzzy msgid "getGidS: too many gid's\n" msgstr "getGnameS: for mange gid'er\n" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "Kunne ikke kanonisere værtsnavn: %s\n" @@ -722,7 +722,7 @@ msgstr "Kunne ikke læse hoved fra %s: %s\n" msgid "Could not open %s: %s\n" msgstr "Kunne ikke åbne %s: %s\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -752,7 +752,7 @@ msgstr "Kunne ikke læse pakkeindhold fra %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -812,17 +812,17 @@ msgstr "linie %d: Fejl ved tolkning af %%description: %s\n" msgid "line %d: Bad option %s: %s\n" msgstr "linie %d: Ugyldigt tilvalg %s: %s\n" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "line %d: For mange navne: %s\n" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "line %d: Pakken eksisterer ikke: %s\n" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "linie %d: Anden beskrivelse\n" @@ -903,7 +903,7 @@ msgstr "linie %d: Tomt mærke: %s\n" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "linie %d: Ugyldigt tegn '-' i %s: %s\n" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "BuildRoot kan ikke være \"/\": %s\n" @@ -1087,32 +1087,32 @@ msgstr "" msgid "Unclosed %%if\n" msgstr "Ikke-lukket %%if\n" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "%s:%d: parseExpressionBoolean returnerer %d\n" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "%s:%d: Fik et %%else uden et %%if\n" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "%s:%d: Fik et %%endif uden et %%if\n" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "forkert udført '%%include'-kommando\n" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 #, fuzzy msgid "No compatible architectures found for build\n" msgstr "Ingen arkitekturer, der kan opbygges\n" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "Pakke har ingen %%description: %s\n" @@ -1242,19 +1242,19 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" "generér pakkehoved(er), der er kompatible med (gamle) rpm[23]-indpakninger" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "undlad at tjekke pakkers afhængighedskrav" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "tjek ikke pakkens arkitektur" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1351,7 +1351,7 @@ msgstr "Intern fejl" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr " mislykkedes - " @@ -1360,78 +1360,78 @@ msgstr " mislykkedes - " msgid "package %s was already added, replacing with %s\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:438 +#: lib/depends.c:441 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "ugyldig db-fil %s\n" -#: lib/depends.c:480 +#: lib/depends.c:483 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(ikke et tal)" @@ -1444,90 +1444,90 @@ msgstr "(ikke et tal)" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 #, fuzzy msgid "(not a blob)" msgstr "(ikke et tal)" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "overspring eventuelle PGP-signaturer" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() returnerede ingen størrelse: %s\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() returnerede ingen monteringspunkter: %s\n" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "kunne ikke finde %s: %s\n" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "Fil %4d: %07o %s.%s\t %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "fil %s er på en ukendt enhed\n" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "linie %d: %s\n" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "%s gemt som %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "kan ikke fjerne %s - katalog ikke tomt\n" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "fjernelse (rmdir) af %s mislykkedes: %s\n" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "%s oprettet som %s\n" @@ -1542,7 +1542,7 @@ msgstr "kan ikke oprette %s: %s\n" msgid "cannot write to %%%s %s\n" msgstr "kunne ikke skrive til %s\n" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "fejl ved oprettelse af midlertidig fil %s\n" @@ -1580,177 +1580,177 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "indpakningsversion 1 understøttes ikke af denne udgave af RPM\n" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: rpmReadSignature mislykkedes\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen tilgængelig signatur\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: readLead mislykkedes\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread mislykkedes: %s\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "udlæs makroudvidelse af <udtryk>+" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 #, fuzzy msgid "read <FILE:...> instead of default file(s)" msgstr "læs <fil:...> i stedet for standard makrofil(er)" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "undlad at benytte libio(3)-API" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "send standard-ud til <kmd>" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "brug <katalog> som topniveau-katalog" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "vis kendte forespørgselsmærker" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "vis den endelige rpmrc og makrokonfiguration" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "medtag mindre detaljerede oplysninger" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "medtag mere detaljerede oplysninger" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "vis versionen af rpm som benyttes" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 msgid "use threads for file state machine" msgstr "" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "aflus protokol-datastrøm" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 #, fuzzy msgid "debug option/argument processing" msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 msgid "debug package state machine" msgstr "" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 msgid "use threads for package state machine" msgstr "" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "aflus rpmio I/O" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "aflus URL-bufferhåndtering" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2200,90 +2200,90 @@ msgstr "underskriv en pakke (slet nuværende signatur)" msgid "generate signature" msgstr "generér PGP/GPG-signatur" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "overspringer installation af %s-%s-%s, %%pre-småskript fejlede rc %d\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "pakke: %s-%s-%s filer test = %d\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Kunne ikke læse hoved fra %s: %s\n" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr " for fil " -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "ugyldigt format: %s\n" @@ -2332,7 +2332,7 @@ msgid "package has neither file owner or id lists\n" msgstr "pakke har hverken filejerskabs- eller id-lister\n" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2347,71 +2347,76 @@ msgstr "forespørgsel af %s mislykkedes\n" msgid "old format source packages cannot be queried\n" msgstr "pakke med gammelt kildeformat kan ikke forespørges\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "ingen pakker udløser %s\n" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "ingen pakker\n" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "ukendt mærke" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "gruppe %s indeholder ingen pakker\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "ingen pakker udløser %s\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Kunne ikke læse %s: %s.\n" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "ingen pakker udløser %s\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "ingen pakker kræver %s\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "ingen pakker tilfører %s\n" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "fil %s: %s\n" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "filen %s tilhører ingen pakke\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "ugyldigt pakkenummer: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "pakkens post-nummer: %u\n" -#: lib/query.c:730 +#: lib/query.c:756 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "post %d kunne ikke læses\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" @@ -2435,100 +2440,100 @@ msgstr "%s: åbning mislykkedes: %s\n" msgid "makeTempFile failed\n" msgstr "makeTempFile mislykkedes\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite mislykkedes: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "parameter er ikke en RPM-pakke\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Kan ikke underskrive v1.0 RPM\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead mislykkedes: %s\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature mislykkedes: %s\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead mislykkedes\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead mislykkedes\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead mislykkedes\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead mislykkedes\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "IKKE O.K." -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr " (MANGLENDE NØGLER: " -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr " (IKKE-BETROEDE NØGLER:" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "O.K." -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2537,42 +2542,47 @@ msgstr "" "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "%s oversprunget grundet manglende ok-flag\n" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "========== gemmer omrokeringer\n" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ekskluderer %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omrokerer %s -> %s\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "ekskluderer %s %s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "omrokerer %s til %s\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "omrokerer kataloget %s til %s\n" @@ -2626,7 +2636,7 @@ msgstr " ... som %s\n" msgid "skipping %s - transfer failed - %s\n" msgstr "overspringer %s - overførsel mislykkedes - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "%s kunne ikke installeres\n" @@ -2646,51 +2656,51 @@ msgstr "fejl ved læsning fra filen %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "filen %s kræver en nyere version af RPM\n" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fandt %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "kunne ikke åbne fil %s: %s\n" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" angiver flere pakker\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "læsning mislykkedes: %s (%d)\n" @@ -2904,38 +2914,53 @@ msgstr "Kunne ikke læse %s, HOME er for stor.\n" msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åbne %s for læsning: %s.\n" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kunne ikke åbne Packages-database i %s\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "ugyldigt pakkenummer: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "Manglende '(' i %s %s\n" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "ugyldigt pakkenummer: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "kan ikke åbne rpm-database i %s\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "linie: %s\n" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "" "kilder i: %s\n" "\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 #, fuzzy msgid "mounted filesystems:\n" msgstr "henter liste over monterede filsystemer\n" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3067,49 +3092,44 @@ msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n" msgid "Header+Payload size: " msgstr "Hovedstørrelse er for stor" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "verificér ikke filerne i pakke" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "overspring eventuelle MD5-signaturer" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "Ingen signatur\n" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "%s oversprunget grundet manglende ok-flag\n" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" @@ -3122,7 +3142,7 @@ msgstr "ekskluderer kataloget %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3135,7 +3155,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3143,16 +3163,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "manglende %s" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: " @@ -3240,71 +3260,80 @@ msgstr "%s har for stor eller lille 'long'-værdi, overspringes\n" msgid "%s has too large or too small integer value, skipped\n" msgstr "%s har for stor eller lille heltalsværdi, overspringes\n" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "manglende { efter %" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "manglende } efter %{" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "tomt mærkeformat" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "tomt mærkenavn" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "ukendt mærke" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "] forventet ved slutningen af tabel" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "uventet ]" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "uventet }" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "? forventet i udtryk" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "{ forventet efter ? i udtryk" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "} forventet i udtryk" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr ": forventet efter ?-underudtryk" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "{ forventet efter : i udtryk" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "| forventet ved slutningen af udtryk" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3328,180 +3357,180 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" "generér hoveder, der er kompatible med (gamle) rpm[23]-indpakningsversioner" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: ukendt mærkenavn: \"%s\" ignoreret\n" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kan ikke åbne '%s'-indeks ved brug af db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, c-format msgid "cannot open %s index\n" msgstr "kan ikke åbne '%s'-indeks\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "der er ikke sat nogen dbpath\n" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan ikke læse hoved ved 0x%x\n" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "fjerner \"%s\" fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "fjerne %d indgange fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "fejl(%d) ved fjernelse af post %s fra %s\n" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fejl(%d) under allokering af ny pakkeinstans\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" "tilføjer \"%s\" til '%s'-indekset.\n" "\n" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "tilføjer %d indgange til '%s'-indekset.\n" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "fjerner %s efter vellykket genopbygning af db3.\n" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "der ikke sat nogen dbpath" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "genopbygger database %s over i %s\n" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "den midlertidige database %s eksisterer allerede\n" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "" "opretter kataloget %s\n" "\n" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "opretter kataloget %s: %s\n" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "åbner gammel database med dbapi %d\n" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "åbner ny database med dbapi %d\n" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kunne ikke tilføje posten, der tidligere var ved %d\n" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunne ikke genopbygge database: original-databasen beholdes\n" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "kunne ikke erstatte gammel database med ny database!\n" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "erstat filer i %s med filer fra %s for at genoprette" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "fjerner kataloget %s\n" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunne ikke fjerne katalog %s: %s\n" @@ -3512,144 +3541,144 @@ msgid "======================== active %d empty %d\n" msgstr "======================== aktiv %d tom %d\n" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(tom)" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(tom)\n" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makroen %%%s har et uafsluttet indhold (body)\n" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makroen %%%s har et ugyldig navn (%%define)\n" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makroen %%%s har uafsluttede parametre\n" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "Makroen %%%s har intet indhold\n" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makroen %%%s kunne ikke udfoldes\n" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makroen %%%s har ugyldigt navn (%%undefine)\n" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) blev ikke brugt under niveau %d\n" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Ukendt tilvalg %c i %s(%s)\n" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Rekursionsdybde(%d) overskrider maks(%d)\n" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "Uafsluttet %c: %s\n" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Et %% efterfølges af en makro, der ikke kan tolkes\n" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Makroen %%%.*s blev ikke fundet, overspringer\n" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "Overløb i målbuffer\n" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "Fil %s: %s\n" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Filen %s er mindre end %u byte\n" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "Succes" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "Ugyldigt svar fra server" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "I/O-fejl for server" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "Tidsudløb for server" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "Kunne ikke skaffe serverens IP-addresse" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "Kunne ikke slå serverens navn op" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "Kunne ikke etablere en forbindelse til serveren" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "Kunne ikke etablere en data-forbindelse til serveren" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "I/O-fejl i lokal fil" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "Kunne ikke sætte fjernserveren i passiv tilstand" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "Fil ikke fundet på server" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "Afbryder programmet" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "Ukendt eller uventet fejl" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "logger på %s som %s, adgangskode %s\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -152,7 +152,7 @@ msgid "%s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM Version %s\n" @@ -402,251 +402,251 @@ msgid "no arguments given" msgstr "Es wurden keine Argumente für die Anfrage angegeben" # , c-format -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." # , c-format -#: build/build.c:218 +#: build/build.c:220 #, fuzzy, c-format msgid "Executing(%s): %s\n" msgstr "Hole %s heraus\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, fuzzy, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" # , c-format -#: build/build.c:237 +#: build/build.c:239 #, fuzzy, c-format msgid "Bad exit status from %s (%s)\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" msgstr "" -#: build/expression.c:225 +#: build/expression.c:228 #, fuzzy msgid "syntax error while parsing ==\n" msgstr "? im Ausdruck erwartet" -#: build/expression.c:255 +#: build/expression.c:258 #, fuzzy msgid "syntax error while parsing &&\n" msgstr "? im Ausdruck erwartet" -#: build/expression.c:264 +#: build/expression.c:267 #, fuzzy msgid "syntax error while parsing ||\n" msgstr "? im Ausdruck erwartet" -#: build/expression.c:307 +#: build/expression.c:310 #, fuzzy msgid "parse error in expression\n" msgstr "? im Ausdruck erwartet" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 #, fuzzy msgid "syntax error in expression\n" msgstr "? im Ausdruck erwartet" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "fehlende { nach %{" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "fehlender ':' bei %s:%d" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "ungültige Paket-Nummer: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "fehlende { nach %{" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" # , c-format -#: build/files.c:613 +#: build/files.c:597 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Lesen von %s fehlgeschlagen: %s." # , c-format -#: build/files.c:623 +#: build/files.c:607 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Lesen von %s fehlgeschlagen: %s." # , c-format -#: build/files.c:635 +#: build/files.c:619 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" # , c-format #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:987 +#: build/files.c:976 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "Verschiebungen müssen mit einem »/« beginnen" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" # , c-format -#: build/files.c:1152 +#: build/files.c:1141 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" # , c-format -#: build/files.c:1531 +#: build/files.c:1520 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:1555 +#: build/files.c:1544 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Verschiebungen müssen mit einem »/« beginnen" -#: build/files.c:1839 +#: build/files.c:1828 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1916 +#: build/files.c:1905 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" # , c-format -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/files.c:2318 +#: build/files.c:2307 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" @@ -654,36 +654,36 @@ msgid "" msgstr "" # , c-format -#: build/files.c:2425 +#: build/files.c:2414 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "" @@ -807,7 +807,7 @@ msgid "Could not open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nicht möglich %s zu schreiben" @@ -842,7 +842,7 @@ msgstr "Nicht möglich %s zu schreiben" msgid "Unable to write payload to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -904,17 +904,17 @@ msgstr "Paket %s wird nicht in %s aufgeführt" msgid "line %d: Bad option %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, fuzzy, c-format msgid "line %d: Too many names: %s\n" msgstr "ungültige Paket-Nummer: %s\n" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, fuzzy, c-format msgid "line %d: Package does not exist: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "" @@ -1002,7 +1002,7 @@ msgstr "Öffnen von %s fehlgeschlagen: %s" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "" @@ -1196,32 +1196,32 @@ msgstr "Öffnen von %s fehlgeschlagen\n" msgid "Unclosed %%if\n" msgstr "" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 #, fuzzy msgid "No compatible architectures found for build\n" msgstr "Paket-Architektur nicht überprüfen" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, fuzzy, c-format msgid "Package has no %%description: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" @@ -1363,19 +1363,19 @@ msgstr "Dateiabhängigkeiten nicht überprüfen" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "Dateiabhängigkeiten nicht überprüfen" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "Paket-Architektur nicht überprüfen" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1477,7 +1477,7 @@ msgstr "Fataler Fehler: " msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 #, fuzzy msgid " failed - " msgstr "pgp fehlgeschlagen" @@ -1487,78 +1487,78 @@ msgstr "pgp fehlgeschlagen" msgid "package %s was already added, replacing with %s\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:438 +#: lib/depends.c:441 #, fuzzy msgid "(rpmlib provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" # , c-format -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/depends.c:480 +#: lib/depends.c:483 msgid "(db provides)" msgstr "" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # FIXME -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(keine Zahl)" @@ -1571,95 +1571,95 @@ msgstr "(keine Zahl)" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 #, fuzzy msgid "(not a blob)" msgstr "(keine Zahl)" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "alle PGP-Signaturen überspringen" # , c-format -#: lib/fs.c:74 +#: lib/fs.c:77 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" # , c-format -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" # , c-format -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "kann %s nicht entfernen - Verzeichnis ist nicht leer" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "Entfernen von %s fehlgeschlagen: %s" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "kann Datei %s nicht öffnen: " @@ -1674,7 +1674,7 @@ msgstr "kann Datei %s nicht öffnen: " msgid "cannot write to %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" @@ -1712,186 +1712,186 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt" -#: lib/package.c:778 +#: lib/package.c:786 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: »rpmReadSignature« fehlgeschlagen\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: Keine Signatur verfügbar\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "Die benutzte RPM-Version anzeigen" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "Standard-Ausgabe nach <BEFEHL> umleiten" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "<VERZ> als Stammverzeichnis benutzen" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "Die benutzte RPM-Version anzeigen" # , c-format -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 #, fuzzy msgid "debug payload file state machine" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 msgid "debug option/argument processing" msgstr "" # , c-format -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 #, fuzzy msgid "debug package state machine" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2361,93 +2361,93 @@ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)" msgid "generate signature" msgstr "PGP-Signatur generieren" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:390 +#: lib/psm.c:394 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "Ausführung des Skripts fehlgeschlagen" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" # , c-format -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Nicht möglich %s zu schreiben" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "Fehler beim Format %s\n" @@ -2498,7 +2498,7 @@ msgid "package has neither file owner or id lists\n" msgstr "Paket hat keinen Namen" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, fuzzy, c-format msgid "open of %s failed: %s\n" @@ -2513,75 +2513,80 @@ msgstr "Anfrage von %s fehlgeschlagen\n" msgid "old format source packages cannot be queried\n" msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "kein Paket triggert %s\n" -#: lib/query.c:515 +#: lib/query.c:517 #, fuzzy msgid "no packages\n" msgstr "Anfrage an alle Pakete" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "unbekannter »Tag«" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "kein Paket triggert %s\n" # , c-format -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "kein Paket triggert %s\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "kein Paket verlangt %s\n" # oder besser: ... listet %s auf? -ke- -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "kein Paket stellt %s bereit\n" # , c-format -#: lib/query.c:693 +#: lib/query.c:719 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "ungültige Paket-Nummer: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "ungültige Paket-Nummer: %s\n" -#: lib/query.c:730 +#: lib/query.c:756 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -2606,144 +2611,149 @@ msgstr "%s: Öffnen fehlgeschlagen\n" msgid "makeTempFile failed\n" msgstr "%s: Öffnen fehlgeschlagen\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, fuzzy, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "Fehler: %s scheint zu keinem RPM-Paket zu gehören\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Kann v1.0-RPM nicht signieren\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Kann v2.0-RPM nicht erneuert signieren\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: »rpmReadSignature« fehlgeschlagen\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 #, fuzzy msgid " (MISSING KEYS:" msgstr " (FEHLENDE SCHLüSSEL)" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr "" -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr "" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" # , c-format -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Hole %s heraus\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "kann Datei %s nicht öffnen: " # , c-format -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Hole %s heraus\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, fuzzy, c-format msgid "relocating %s to %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" @@ -2798,7 +2808,7 @@ msgstr "" msgid "skipping %s - transfer failed - %s\n" msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" @@ -2818,52 +2828,52 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 #, fuzzy msgid "installing binary packages\n" msgstr "Paket installieren" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "lesen fehlgeschlagen: %s (%d)" @@ -3081,37 +3091,52 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "ungültige Paket-Nummer: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "fehlende { nach %{" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "ungültige Paket-Nummer: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" # , c-format -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "Hole %s heraus\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3247,49 +3272,44 @@ msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein" msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "Paket installieren" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "alle MD5-Signaturen überspringen" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Keine Signatur verfügbar\n" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" @@ -3302,7 +3322,7 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3315,7 +3335,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3323,16 +3343,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "fehlende { nach %{" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " @@ -3420,74 +3440,83 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "fehlende { nach %{" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "fehlende } nach %{" # »Tag« übersetzen??? -ke- -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "leeres »Tag«-Format" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "leerer »Tag«-Name" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "unbekannter »Tag«" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "] am Ende des Arrays erwartet" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "unerwartete ]" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "unerwartete }" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "? im Ausdruck erwartet" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ nach ? im Ausdruck erwartet" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "} im Ausdruck erwartet" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr ": nach ? Unterausdruck erwartet" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 #, fuzzy msgid "{ expected after : in expression" msgstr "{ nach : im Ausdruck erwartet" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "| am Ende des Ausdrucks erwartet" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3511,183 +3540,183 @@ msgstr "Anfrage von %s fehlgeschlagen\n" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kann Datei %s nicht öffnen: " -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 #, fuzzy msgid "no dbpath has been set\n" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "Fehler beim Eintrag %s von %s" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "Fehler beim Eintrag %s von %s" # FIXME -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "Fehler beim Eintrag %s von %s" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # FIXME -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "die temporäre Datenbank %s existiert schon" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" # , c-format -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -3698,154 +3727,154 @@ msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "(unbekannter Typ)" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Paket %s in %s nicht gefunden" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "" # , c-format #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 #, fuzzy msgid "Bad server response" msgstr "Nicht passende Antwort des FTP-Servers" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 #, fuzzy msgid "Server I/O error" msgstr "FTP IO-Fehler" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 #, fuzzy msgid "Server timeout" msgstr "Timeout des FTP-Servers" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 #, fuzzy msgid "Unable to lookup server host address" msgstr "Unmöglich die Hostadresse des FTP-Servers zu bestimmen" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 #, fuzzy msgid "Unable to lookup server host name" msgstr "Unmöglich den Hostnamen des FTP-Servers zu bestimmen" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 #, fuzzy msgid "Failed to connect to server" msgstr "Verbindung zum FTP-Server fehlgeschlagen" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 #, fuzzy msgid "Failed to establish data connection to server" msgstr "Aufbau einer Datenverbindung zum FTP-Server fehlgeschlagen" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 #, fuzzy msgid "I/O error to local file" msgstr "IO-Fehler bei lokaler Datei" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "Fehler beim Setzen des FTP-Servers in den passiven Modus" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "Datei auf dem Server nicht gefunden" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Unknown or unexpected error" msgstr "FTP Unbekannter oder nicht erwarteter Fehler" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" @@ -109,7 +109,7 @@ msgstr "" msgid "%s: %s\n" msgstr "en voinut avata %s: %s" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM versio %s\n" @@ -351,277 +351,277 @@ msgstr "tarkistukselle ei annettu parametrejä" msgid "no arguments given" msgstr "kyselylle ei annettu parametrejä" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 #, fuzzy msgid "Unable to open temp file.\n" msgstr "En voi avata %s luettavaksi: %s." -#: build/build.c:218 +#: build/build.c:220 #, fuzzy, c-format msgid "Executing(%s): %s\n" msgstr "Haen: %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, fuzzy, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: build/build.c:237 +#: build/build.c:239 #, fuzzy, c-format msgid "Bad exit status from %s (%s)\n" msgstr "en voinut avata %s: %s" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" msgstr "" -#: build/expression.c:225 +#: build/expression.c:228 #, fuzzy msgid "syntax error while parsing ==\n" msgstr "odotin '?'-merkkiä ilmauksessa" -#: build/expression.c:255 +#: build/expression.c:258 #, fuzzy msgid "syntax error while parsing &&\n" msgstr "odotin '?'-merkkiä ilmauksessa" -#: build/expression.c:264 +#: build/expression.c:267 #, fuzzy msgid "syntax error while parsing ||\n" msgstr "odotin '?'-merkkiä ilmauksessa" -#: build/expression.c:307 +#: build/expression.c:310 #, fuzzy msgid "parse error in expression\n" msgstr "odotin '?'-merkkiä ilmauksessa" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 #, fuzzy msgid "syntax error in expression\n" msgstr "odotin '?'-merkkiä ilmauksessa" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "puuttuva '{' '%':n jälkeen" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "puuttuva ':', %s:%d" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "puuttuva '{' '%':n jälkeen" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:613 +#: build/files.c:597 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "En voi lukea %s: %s." -#: build/files.c:623 +#: build/files.c:607 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "En voi lukea %s: %s." -#: build/files.c:635 +#: build/files.c:619 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "En voi lukea %s: %s." -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:987 +#: build/files.c:976 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "siirtojen pitää alkaa /-merkillä" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1152 +#: build/files.c:1141 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "En voi lukea %s: %s." -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1531 +#: build/files.c:1520 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "En voi lukea %s: %s." -#: build/files.c:1555 +#: build/files.c:1544 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: readLead epäonnistui\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "siirtojen pitää alkaa /-merkillä" -#: build/files.c:1839 +#: build/files.c:1828 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1916 +#: build/files.c:1905 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:2318 +#: build/files.c:2307 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "virhe etsittäessä pakettia %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "en voinut avata %s: %s" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "" @@ -735,7 +735,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Could not open %s: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "%s:n kirjoitus ei onnistu" @@ -765,7 +765,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Unable to write payload to %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -825,17 +825,17 @@ msgstr "paketti %s ei ole %s:ssä" msgid "line %d: Bad option %s: %s\n" msgstr "en voinut avata %s: %s" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, fuzzy, c-format msgid "line %d: Too many names: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, fuzzy, c-format msgid "line %d: Package does not exist: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "" @@ -916,7 +916,7 @@ msgstr "en voinut avata %s: %s" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "en voinut avata %s: %s" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "" @@ -1096,32 +1096,32 @@ msgstr "%s:n avaus epäonnistui\n" msgid "Unclosed %%if\n" msgstr "" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 #, fuzzy msgid "No compatible architectures found for build\n" msgstr "älä tarkista paketin arkkitehtuuria" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, fuzzy, c-format msgid "Package has no %%description: %s\n" msgstr "paketti %s ei ole %s:ssä" @@ -1260,19 +1260,19 @@ msgstr "älä tarkista paketin riippuvuuksia" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "älä tarkista paketin riippuvuuksia" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "älä tarkista paketin arkkitehtuuria" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1374,7 +1374,7 @@ msgstr "vakava virhe: " msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 #, fuzzy msgid " failed - " msgstr "pgp epäonnistui" @@ -1384,76 +1384,76 @@ msgstr "pgp epäonnistui" msgid "package %s was already added, replacing with %s\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:438 +#: lib/depends.c:441 #, fuzzy msgid "(rpmlib provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "en voinut avata %s: %s" -#: lib/depends.c:480 +#: lib/depends.c:483 msgid "(db provides)" msgstr "" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(ei ole luku)" @@ -1466,90 +1466,90 @@ msgstr "(ei ole luku)" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 #, fuzzy msgid "(not a blob)" msgstr "(ei ole luku)" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "ohita PGP-allekirjoitukset" -#: lib/fs.c:74 +#: lib/fs.c:77 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "%s:n luonti epäonnistui\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "en voinut avata %s: %s" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "en voinut avata %s: %s" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "en voi poistaa %s -hakemisto ei ole tyhjä" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s:n rmdir epäonnistui: %s" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "en voinut avata tiedostoa %s: " @@ -1564,7 +1564,7 @@ msgstr "en voinut avata tiedostoa %s: " msgid "cannot write to %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" @@ -1602,182 +1602,182 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja" -#: lib/package.c:778 +#: lib/package.c:786 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: rpmReadSignature epäonnistui\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ei allekirjoitusta saatavilla\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: readLead epäonnistui\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "tulosta käytetyn rpm:n versio" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "lähetä vakiotuloste <komento>:lle" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "käytä <hakem> ylimpänä hakemistona" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "tulosta käytetyn rpm:n versio" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 #, fuzzy msgid "debug payload file state machine" msgstr "en voinut avata %s: %s" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "en voinut avata %s: %s" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 #, fuzzy msgid "debug package state machine" msgstr "en voinut avata %s: %s" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "en voinut avata %s: %s" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2244,90 +2244,90 @@ msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)" msgid "generate signature" msgstr "generoi PGP-allekirjoitus" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:390 +#: lib/psm.c:394 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "%s:n kirjoitus ei onnistu" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr "" -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "virhe formaatissa: %s\n" @@ -2378,7 +2378,7 @@ msgid "package has neither file owner or id lists\n" msgstr "paketilla ei ole nimeä" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, fuzzy, c-format msgid "open of %s failed: %s\n" @@ -2393,72 +2393,77 @@ msgstr "%s:n kysely ei onnistunut\n" msgid "old format source packages cannot be queried\n" msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "mikään paketti ei laukaise %s:a\n" -#: lib/query.c:515 +#: lib/query.c:517 #, fuzzy msgid "no packages\n" msgstr "kysele kaikki paketit" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "tuntematon nimiö" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "mikään paketti ei laukaise %s:a\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "En voi lukea %s: %s." -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "mikään paketti ei laukaise %s:a\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "mikään pakettie ei tarvitse %s:a\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "mikään paketti ei tarjoa %s:a\n" -#: lib/query.c:693 +#: lib/query.c:719 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/query.c:730 +#: lib/query.c:756 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -2482,142 +2487,147 @@ msgstr "%s: avaus ei onnistunut\n" msgid "makeTempFile failed\n" msgstr "%s: avaus ei onnistunut\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, fuzzy, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "virhe: %s ei vaikuta RPM paketilta\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: En voi allekirjoittaa v1.0 RPM:ää\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: En voi uudelleen allekirjoittaa v2.0 RPM:ää\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmReadSignature epäonnistui\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 #, fuzzy msgid " (MISSING KEYS:" msgstr "(PUUTTUVAT AVAIMET)" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr "" -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr "" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Haen: %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Haen: %s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, fuzzy, c-format msgid "relocating %s to %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" @@ -2670,7 +2680,7 @@ msgstr "" msgid "skipping %s - transfer failed - %s\n" msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" @@ -2690,52 +2700,52 @@ msgstr "virhe luotaessa hakemistoa %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 #, fuzzy msgid "installing binary packages\n" msgstr "asenna paketti" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "luku epäonnistui: %s (%d)" @@ -2946,35 +2956,50 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "En voi avata %s luettavaksi: %s." -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "virheellinen paketin numero: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "puuttuva '{' '%':n jälkeen" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "virheellinen paketin numero: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "en voinut avata %s: %s" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "Haen: %s\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3110,49 +3135,44 @@ msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa" msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "asenna paketti" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "ohita MD5-allekirjoitukset" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Ei allekirjoitusta saatavilla\n" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" @@ -3165,7 +3185,7 @@ msgstr "virhe luotaessa hakemistoa %s: %s" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3178,7 +3198,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3186,16 +3206,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "puuttuva '{' '%':n jälkeen" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" @@ -3283,73 +3303,82 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "puuttuva '{' '%':n jälkeen" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "puuttuva '{' '%{':n jälkeen" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "tyhjä nimiön formaatti" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "tyhjä nimiön nimi" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "tuntematon nimiö" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "']' puuttuu taulukkomäärittelyn lopusta" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "odottamaton ']'" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "odottamaton '}'" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "odotin '?'-merkkiä ilmauksessa" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 #, fuzzy msgid "{ expected after ? in expression" msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa " -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "odotin '}'-merkkiä ilmauksessa" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa " -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 #, fuzzy msgid "{ expected after : in expression" msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa " -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "odotin '}'-merkkiä ilmauksen lopussa" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3373,177 +3402,177 @@ msgstr "%s:n kysely ei onnistunut\n" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "en voinut avata tiedostoa %s: " -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "virhe: en voi avata %s\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "en voi lukea headeria %d:stä päivittäessä" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "väliaikainen tietokanta %s on jo olemassa" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "en voi lisätä tietuetta %d:stä" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" @@ -3554,153 +3583,153 @@ msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "(tuntematon tyyppi)" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "paketti %s ei ole %s:ssä" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "en voinut avata %s: %s" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 #, fuzzy msgid "Bad server response" msgstr "Virheellinen FTP-palvelijan vastaus" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 #, fuzzy msgid "Server I/O error" msgstr "FTP:n IO-virhe" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 #, fuzzy msgid "Server timeout" msgstr "FTP-palvelimen timeout" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 #, fuzzy msgid "Unable to lookup server host address" msgstr "FTP-palvelimen osoitetta ei löytynyt" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 #, fuzzy msgid "Unable to lookup server host name" msgstr "FTP-palvelimen nimeä ei löytynyt" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 #, fuzzy msgid "Failed to connect to server" msgstr "En saanut yhteyttä FTP-palvelijaan" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 #, fuzzy msgid "Failed to establish data connection to server" msgstr "En saanut data-yhteyttä FTP-palvelijaan" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 #, fuzzy msgid "I/O error to local file" msgstr "Paikallisen tiedoston IO-virhe" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "Virhe asetettaessa palvelinta passiiviin moodiin" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Unknown or unexpected error" msgstr "FTP:n tuntematon tai odottamaton virhe" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM 4.2.1\n" -"POT-Creation-Date: 2003-06-05 09:50-0400\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2003-07-06 01:36+0200\n" "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n" "Language-Team: RPM French Translation <rpm-fr@livna.org>\n" @@ -101,7 +101,9 @@ msgstr "Options de la base de données" #: rpmqv.c:93 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:" -msgstr "Options de construction avec [ <fichier_spec> | <tarball> | <paquetage source> ]:" +msgstr "" +"Options de construction avec [ <fichier_spec> | <tarball> | <paquetage " +"source> ]:" #: rpmqv.c:99 msgid "Install/Upgrade/Erase options:" @@ -117,7 +119,7 @@ msgstr "Options communes à tous les modes de rpm:" msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:102 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM version %s\n" @@ -129,7 +131,9 @@ msgstr "Copyright (C) 1998-2002 - Red Hat, Inc.\n" #: rpmqv.c:137 msgid "" "This program may be freely redistributed under the terms of the GNU GPL\n" -msgstr "Ce programme peut être librement redistribué sous les termes de la licence GNU GPL\n" +msgstr "" +"Ce programme peut être librement redistribué sous les termes de la licence " +"GNU GPL\n" #: rpmqv.c:295 #, c-format @@ -158,7 +162,8 @@ msgstr "source de requête inattendue" #: rpmqv.c:413 msgid "only installation, upgrading, rmsource and rmspec may be forced" -msgstr "seuls l'installation, la mise à jour, rmsource et rmspec peuvent être forcés" +msgstr "" +"seuls l'installation, la mise à jour, rmsource et rmspec peuvent être forcés" #: rpmqv.c:415 msgid "files may only be relocated during package installation" @@ -171,11 +176,14 @@ msgstr "impossible d'utiliser --prefix avec --relocate ou --excludepath" #: rpmqv.c:421 msgid "" "--relocate and --excludepath may only be used when installing new packages" -msgstr "--relocate et --excludepath ne peuvent être utilisés qu'à l'installation de nouveaux paquetages" +msgstr "" +"--relocate et --excludepath ne peuvent être utilisés qu'à l'installation de " +"nouveaux paquetages" #: rpmqv.c:424 msgid "--prefix may only be used when installing new packages" -msgstr "--prefix ne peut être utilisé qu'à l'installation de nouveaux paquetages" +msgstr "" +"--prefix ne peut être utilisé qu'à l'installation de nouveaux paquetages" #: rpmqv.c:427 msgid "arguments to --prefix must begin with a /" @@ -223,7 +231,8 @@ msgstr "--ignoresize ne peut être utilisé qu'à l'installation de paquetages" #: rpmqv.c:472 msgid "--allmatches may only be specified during package erasure" -msgstr "--allmatches ne peut être utilisé qu'à la désinstallation de paquetages" +msgstr "" +"--allmatches ne peut être utilisé qu'à la désinstallation de paquetages" #: rpmqv.c:476 msgid "--allfiles may only be specified during package installation" @@ -231,37 +240,48 @@ msgstr "--allfiles ne peut être utilisé qu'à l'installation de paquetages" #: rpmqv.c:481 msgid "--justdb may only be specified during package installation and erasure" -msgstr "--justdb ne peut être utilisé qu'à l'installation/la désinstallation de paquetages" +msgstr "" +"--justdb ne peut être utilisé qu'à l'installation/la désinstallation de " +"paquetages" #: rpmqv.c:486 msgid "" "script disabling options may only be specified during package installation " "and erasure" -msgstr "les options désactivant les scripts ne peuvent être utilisées qu'à la (dés)installation" +msgstr "" +"les options désactivant les scripts ne peuvent être utilisées qu'à la (dés)" +"installation" #: rpmqv.c:491 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" -msgstr "les options desactivant les triggers ne peuvent être utilisées qu'à la (dés)installation" +msgstr "" +"les options desactivant les triggers ne peuvent être utilisées qu'à la (dés)" +"installation" #: rpmqv.c:495 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" -msgstr "--nodeps ne peut être spécifié que pour la (re)construction, la recompilation, l'(dés)installation, et la vérification" +msgstr "" +"--nodeps ne peut être spécifié que pour la (re)construction, la " +"recompilation, l'(dés)installation, et la vérification" #: rpmqv.c:500 msgid "" "--test may only be specified during package installation, erasure, and " "building" -msgstr "--test ne peut être spécifié que pour la (dés)installation et la construction" +msgstr "" +"--test ne peut être spécifié que pour la (dés)installation et la construction" #: rpmqv.c:505 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" -msgstr "--root (-r) ne peut être utilisé que pour la (dés)installation, les requêtes et la reconstruction de la base de données" +msgstr "" +"--root (-r) ne peut être utilisé que pour la (dés)installation, les requêtes " +"et la reconstruction de la base de données" #: rpmqv.c:517 msgid "arguments to --root (-r) must begin with a /" @@ -337,235 +357,238 @@ msgstr "aucun argument fourni à la vérification" msgid "no arguments given" msgstr "aucun argument fourni" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "Incapable d'ouvrir un fichier temporaire.\n" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "Exécution_de(%s): %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "L'exec de %s a échoué (%s): %s\n" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "Mauvais status de sortie pour %s (%s)\n" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" -msgstr "\n\nErreur de construction de RPM:\n" +msgstr "" +"\n" +"\n" +"Erreur de construction de RPM:\n" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "erreur de syntaxe en analysant ==\n" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "erreur de syntaxe en analysant &&\n" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "erreur de syntaxe en analysant ||\n" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "erreur de syntaxe dans l'expression\n" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "( non fermée\n" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "- seulement sur des nombres\n" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "! seulement sur des nombres\n" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "les types doivent correspondre\n" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "* / non supportés sur des chaînes de caractères\n" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "- non supporté sur des chaînes de caractères\n" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "&& et || ne sont pas supportés sur des chaînes de caractères\n" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "erreur de syntaxe dans l'expression\n" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "échec du TIMECHECK: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "'(' manquante dans %s %s\n" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "')' manquante dans %s(%s\n" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "Lexème %s invalide: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, c-format msgid "Missing %s in %s %s\n" msgstr "%s manquant(e) dans %s\n" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "espace non-blanc suivant %s(): %s\n" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Mauvaise syntaxe: %s(%s)\n" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Mauvais mode spec: %s(%s)\n" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Mauvais dirmode spec: %s(%s)\n" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Mauvaise longueur de la locale: \"%.*s\" dans %%lang(%s)\n" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Deux fois la même locale %.*s dans %%lang(%s)\n" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "Limite atteinte pour %%docdir\n" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "Un seul argument pour %%docdir\n" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "Deux fichiers sur une seule ligne: %s\n" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "Le fichier doit commencer par \"/\": %s\n" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Ne peut mélanger un %%doc spécial avec d'autre formes: %s\n" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "Fichier listé deux fois: %s\n" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Lien symbolique pointant sur BuildRoot: %s -> %s\n" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Le fichier ne correpond pas à prefix (%s): %s\n" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "Fichier non trouvé: %s\n" -#: build/files.c:1763 +#: build/files.c:1752 #, c-format msgid "%s: public key read failed.\n" msgstr "%s: échec de la lecture de la clé publique.\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "%s n'est pas une clé publique blindée.\n" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Le fichier non précédé d'un \"/\": %s\n" -#: build/files.c:1839 +#: build/files.c:1828 #, c-format msgid "Glob not permitted: %s\n" msgstr "Substitution non permise: %s\n" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "Fichier non trouvé par la substitution: %s\n" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Ne peut ouvrir le fichier donné à %%files %s: %s\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "Ligne: %s\n" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "Mauvais fichier: %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Mauvais possesseur/groupe: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "Vérification des fichiers non empaquetés: %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" @@ -574,36 +597,36 @@ msgstr "" "Fichier(s) installé(s) (mais non empaquetés):\n" "%s" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Traitement des fichiers: %s-%s-%s\n" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "getUname: trop d'uid\n" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "getUnameS: trop d'uid\n" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "getUidS: trop d'uid\n" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "getGname: trop de gid\n" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "getGnameS: trop de gid\n" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "getGidS: trop de gid\n" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "Ne peut canoniser le nom d'hôte: %s\n" @@ -713,7 +736,7 @@ msgstr "Impossible de recharger l'entête de la signature.\n" msgid "Could not open %s: %s\n" msgstr "Impossible d'ouvrir %s: %s\n" -#: build/pack.c:632 lib/psm.c:1657 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "Impossible d'écrire le paquetage: %s\n" @@ -743,7 +766,7 @@ msgstr "Impossible de lire la charge utile dans %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Impossible d'écrire la charge utile dans %s: %s\n" -#: build/pack.c:725 lib/psm.c:1947 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Ecrit: %s\n" @@ -803,17 +826,17 @@ msgstr "ligne %d: erreur dans l'analyxe syntaxique de la %%description: %s\n" msgid "line %d: Bad option %s: %s\n" msgstr "ligne %d: mauvaise option %s: %s\n" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "ligne %d: trop de noms: %s\n" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "ligne %d: package inexistant: %s\n" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "ligne %d: deuxième description\n" @@ -1021,7 +1044,9 @@ msgstr "ligne %d: deuxième %%prep\n" #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n" -msgstr "ligne %d: le lexème de dépendance doit commencer par un alphanumérique, '_' ou '/': %s\n" +msgstr "" +"ligne %d: le lexème de dépendance doit commencer par un alphanumérique, '_' " +"ou '/': %s\n" #: build/parseReqs.c:113 #, c-format @@ -1111,7 +1136,9 @@ msgstr "buildroot déjà spécifié, %s ignoré\n" #: build/poptBT.c:160 #, c-format msgid "build through %prep (unpack sources and apply patches) from <specfile>" -msgstr "construction jusqu'à la section %prep (deballage des sources et applications des patchs) du <fichier_spec>" +msgstr "" +"construction jusqu'à la section %prep (deballage des sources et applications " +"des patchs) du <fichier_spec>" #: build/poptBT.c:161 build/poptBT.c:164 build/poptBT.c:167 build/poptBT.c:170 #: build/poptBT.c:173 build/poptBT.c:176 build/poptBT.c:179 @@ -1120,11 +1147,15 @@ msgstr "<fichier_spec>" #: build/poptBT.c:163 msgid "build through %build (%prep, then compile) from <specfile>" -msgstr "construction jusqu'à la section %build (%prep, et compilation) du <fichier_spec>" +msgstr "" +"construction jusqu'à la section %build (%prep, et compilation) du " +"<fichier_spec>" #: build/poptBT.c:166 msgid "build through %install (%prep, %build, then install) from <specfile>" -msgstr "construction jusqu'à la section %install (%prep, %build, et installation) du <fichier_spec>" +msgstr "" +"construction jusqu'à la section %install (%prep, %build, et installation) du " +"<fichier_spec>" #: build/poptBT.c:169 #, c-format @@ -1133,7 +1164,8 @@ msgstr "vérifier la section %files du <fichier_spec>" #: build/poptBT.c:172 msgid "build source and binary packages from <specfile>" -msgstr "construire les paquetages sources et binaires à partir du <fichier_spec>" +msgstr "" +"construire les paquetages sources et binaires à partir du <fichier_spec>" #: build/poptBT.c:175 msgid "build binary package only from <specfile>" @@ -1146,7 +1178,9 @@ msgstr "construction du paquetage source seulement à partir du <fichier_spec>" #: build/poptBT.c:182 #, c-format msgid "build through %prep (unpack sources and apply patches) from <tarball>" -msgstr "construire jusqu'à la section %prep (déballage des sources et application des patchs) à partir du <tarball>" +msgstr "" +"construire jusqu'à la section %prep (déballage des sources et application " +"des patchs) à partir du <tarball>" #: build/poptBT.c:183 build/poptBT.c:186 build/poptBT.c:189 build/poptBT.c:192 #: build/poptBT.c:195 build/poptBT.c:198 build/poptBT.c:201 @@ -1155,11 +1189,15 @@ msgstr "<tarball>" #: build/poptBT.c:185 msgid "build through %build (%prep, then compile) from <tarball>" -msgstr "construire jusqu'à la section %build (%prep, puis compilation) à partir du <tarball>" +msgstr "" +"construire jusqu'à la section %build (%prep, puis compilation) à partir du " +"<tarball>" #: build/poptBT.c:188 msgid "build through %install (%prep, %build, then install) from <tarball>" -msgstr "construire jusqu'à la section %build (%prep, %build, puis installation) à partir du <tarball>" +msgstr "" +"construire jusqu'à la section %build (%prep, %build, puis installation) à " +"partir du <tarball>" #: build/poptBT.c:191 #, c-format @@ -1189,7 +1227,9 @@ msgstr "<paquetage source>" #: build/poptBT.c:207 msgid "" "build through %install (%prep, %build, then install) from <source package>" -msgstr "construire jusqu'à la section %install (%prep, %build, et installation) à partir du <paquetage source>" +msgstr "" +"construire jusqu'à la section %install (%prep, %build, et installation) à " +"partir du <paquetage source>" #: build/poptBT.c:211 msgid "override build root" @@ -1223,17 +1263,17 @@ msgstr "ne pas vérifier les dépendances de construction" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "générer un(des) entête(s) compatible(s) avec l'emballage rpm[23]" -#: build/poptBT.c:229 lib/poptALL.c:223 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 msgid "don't verify package digest(s)" msgstr "ne pas vérifier les sommes de hachage du paquetage" -#: build/poptBT.c:231 lib/poptALL.c:225 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 msgid "don't verify database header(s) when retrieved" msgstr "ne pas vérifier l'entête de la base de données à la récupération" -#: build/poptBT.c:233 lib/poptALL.c:231 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 msgid "don't verify package signature(s)" msgstr "ne pas vérifier la(les) signature(s) du paquetage" @@ -1264,7 +1304,8 @@ msgstr "surcharger la plate-forme cible" #: build/poptBT.c:248 msgid "lookup i18N strings in specfile catalog" -msgstr "chercher les chaînes de caractères i18n dans le catalogue du fichier spec" +msgstr "" +"chercher les chaînes de caractères i18n dans le catalogue du fichier spec" #: build/spec.c:237 #, c-format @@ -1289,7 +1330,9 @@ msgstr "ne peut faire la requête sur %s: %s\n" #: build/spec.c:718 #, c-format msgid "query of specfile %s failed, can't parse\n" -msgstr "échec de la requête sur le fichier spec %s, impossible de faire l'analyser syntaxique\n" +msgstr "" +"échec de la requête sur le fichier spec %s, impossible de faire l'analyser " +"syntaxique\n" #: lib/cpio.c:207 #, c-format @@ -1328,7 +1371,7 @@ msgstr "Erreur interne" msgid "Archive file not in header" msgstr "L'entête ne contient pas le fichier archive" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr " échec - " @@ -1364,7 +1407,8 @@ msgstr "(fourni par un paquetage)" #: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" -msgstr "ignorer la(les) relation(s) entre les noms de paquetages [%d]\t%s -> %s\n" +msgstr "" +"ignorer la(les) relation(s) entre les noms de paquetages [%d]\t%s -> %s\n" #: lib/depends.c:972 #, c-format @@ -1381,7 +1425,9 @@ msgstr "========== enregistrement des relations de Ttri\n" msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" -msgstr "========== Ttri des paquetages (ordre, #prédécesseurs, #succeseurs, arbre, profondeur)\n" +msgstr "" +"========== Ttri des paquetages (ordre, #prédécesseurs, #succeseurs, arbre, " +"profondeur)\n" #: lib/depends.c:1381 #, c-format @@ -1457,46 +1503,47 @@ msgstr "" msgid "file %s is on an unknown device\n" msgstr "le fichier %s est sur un périphérique inconnu\n" -#: lib/fsm.c:338 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +#, fuzzy +msgid "========== Directories not explicitly included in package:\n" msgstr "========== Répertoires non explicitement inclus dans le paquetage:\n" -#: lib/fsm.c:340 +#: lib/fsm.c:352 #, c-format msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1242 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "le répertoire %s a été créé avec les permissions %04o.\n" -#: lib/fsm.c:1540 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "l'archive %s n'était pas dans la liste de fichiers d'entêtes\n" -#: lib/fsm.c:1667 lib/fsm.c:1801 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "%s sauvé en tant que %s\n" -#: lib/fsm.c:1827 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s échec du rmdir sur %s : répertoire non-vide\n" -#: lib/fsm.c:1833 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s échec du rmdir sur %s: %s\n" -#: lib/fsm.c:1843 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s n'a pu délier %s: %s\n" -#: lib/fsm.c:1863 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "%s créé en tant que %s\n" @@ -1549,163 +1596,176 @@ msgstr "hdr SHA1: MAUVAIS, non hexa\n" msgid "hdr DSA: BAD, not binary\n" msgstr "hdr SDA: MAUVAIS, non binaire\n" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "seules les signatures V3 peut être vérifiées, signature V%u ignorée\n" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "hdr taille(%d): PASBON, la lecture renvoie %d\n" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "hdr blob(%d): PASBON, la lecture renvoie %d\n" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" -msgstr "la version 1 de l'emballage n'est pas supportée par cette version de RPM\n" +msgstr "" +"la version 1 de l'emballage n'est pas supportée par cette version de RPM\n" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" -msgstr "seuls les emaballages avec un numéro de version majeur <= 4 sont supportés par cette version de rpm\n" +msgstr "" +"seuls les emaballages avec un numéro de version majeur <= 4 sont supportés " +"par cette version de rpm\n" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: échec de rpmReadSignature: %s" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: aucune signature disponible\n" -#: lib/package.c:843 +#: lib/package.c:852 #, c-format msgid "%s: headerRead failed: %s" msgstr "%s: headerRead a échoué: %s" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread a échoué: %s\n" -#: lib/poptALL.c:210 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "prédéfinir la MACRO avec l'EXPRression" -#: lib/poptALL.c:211 lib/poptALL.c:214 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "'MACRO EXPR'" -#: lib/poptALL.c:213 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "definit MACRO ayant pour valeur EXPR" -#: lib/poptALL.c:216 +#: lib/poptALL.c:225 msgid "print macro expansion of EXPR" msgstr "affiche la macro-expansion d'EXPR" -#: lib/poptALL.c:217 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "'EXPR'" -#: lib/poptALL.c:219 lib/poptALL.c:238 lib/poptALL.c:242 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "Lire <FICHIER:...> au lieu du(des) fichier(s) par défaut" -#: lib/poptALL.c:220 lib/poptALL.c:239 lib/poptALL.c:243 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "<FICHIER:...>" -#: lib/poptALL.c:228 lib/poptALL.c:262 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "utilisation de l'API libio(3) désactivée" -#: lib/poptALL.c:234 +#: lib/poptALL.c:243 msgid "send stdout to CMD" msgstr "envoyer la sortie standard à CMD" -#: lib/poptALL.c:235 +#: lib/poptALL.c:244 msgid "CMD" msgstr "CMD" -#: lib/poptALL.c:246 +#: lib/poptALL.c:255 msgid "use ROOT as top level directory" msgstr "utiliser RACINE comme répertoire racine" -#: lib/poptALL.c:247 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "RACINE" -#: lib/poptALL.c:250 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "afficher les tags de requête connus" -#: lib/poptALL.c:252 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "afficher la configuration finale des macros et rpmrc" -#: lib/poptALL.c:254 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "afficher moins de détails" -#: lib/poptALL.c:256 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "afficher plus de détails" -#: lib/poptALL.c:258 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "afficher la version de rpm utilisé" -#: lib/poptALL.c:271 +#: lib/poptALL.c:280 msgid "debug payload file state machine" msgstr "déboguer la machine à états du fichier de la charge utile" -#: lib/poptALL.c:273 +#: lib/poptALL.c:282 +#, fuzzy +msgid "use threads for file state machine" +msgstr "déboguer la machine à états du fichier de la charge utile" + +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "déboguer le flux de données du protocole" -#: lib/poptALL.c:278 +#: lib/poptALL.c:289 msgid "debug option/argument processing" msgstr "déboguer le traitement des options/arguments" -#: lib/poptALL.c:281 +#: lib/poptALL.c:292 msgid "debug package state machine" msgstr "déboguer la machine à état du paquetage" -#: lib/poptALL.c:293 +#: lib/poptALL.c:294 +#, fuzzy +msgid "use threads for package state machine" +msgstr "déboguer la machine à état du paquetage" + +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "déboguer les E/S de rpmio" -#: lib/poptALL.c:303 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "déboguer la manipulation de cache d'URL" #. @-nullpass@ -#: lib/poptALL.c:373 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "%s: table d'option mal configurée (%d)\n" @@ -1740,13 +1800,16 @@ msgstr "rajouter à la transaction les paquetages suggérés" #: lib/poptI.c:155 msgid "install all files, even configurations which might otherwise be skipped" -msgstr "installer tous les fichiers, meme si les configurations disent le contraire" +msgstr "" +"installer tous les fichiers, meme si les configurations disent le contraire" #: lib/poptI.c:159 msgid "" "remove all packages which match <package> (normally an error is generated if " "<package> specified multiple packages)" -msgstr "retirer tous les paquetages qui correspondent à <paquetage> (normalement on retourne une erreur si le <paquetage> correspond à plusieurs paquetages" +msgstr "" +"retirer tous les paquetages qui correspondent à <paquetage> (normalement on " +"retourne une erreur si le <paquetage> correspond à plusieurs paquetages" #: lib/poptI.c:164 tools/rpmgraph.c:273 msgid "use anaconda \"presentation order\"" @@ -1762,7 +1825,9 @@ msgstr "reloger des fichiers d'un paquetage non relogeable" #: lib/poptI.c:176 msgid "save erased package files by renaming into sub-directory" -msgstr "sauver les fichiers du paquetage désinstallé en les renommant dans un sous-répertoire" +msgstr "" +"sauver les fichiers du paquetage désinstallé en les renommant dans un sous-" +"répertoire" #: lib/poptI.c:179 msgid "erase (uninstall) package" @@ -1802,7 +1867,9 @@ msgstr "<paquetage>+" #: lib/poptI.c:198 msgid "print hash marks as package installs (good with -v)" -msgstr "afficher des marqueurs au fur et à mesure que le paquetage s'installe (avec -v c'est bien(tm))" +msgstr "" +"afficher des marqueurs au fur et à mesure que le paquetage s'installe (avec -" +"v c'est bien(tm))" #: lib/poptI.c:201 msgid "don't verify package architecture" @@ -1826,7 +1893,8 @@ msgstr "installer le(s) paquetage(s)" #: lib/poptI.c:215 msgid "update the database, but do not modify the filesystem" -msgstr "mettre à jour la base données, mais ne pas modifier le système de fichiers" +msgstr "" +"mettre à jour la base données, mais ne pas modifier le système de fichiers" #: lib/poptI.c:221 msgid "do not verify package dependencies" @@ -1838,7 +1906,9 @@ msgstr "ne pas vérifier les sommes MD5 des fichiers" #: lib/poptI.c:230 msgid "do not reorder package installation to satisfy dependencies" -msgstr "ne pas ré-arranger l'ordre d'installation des paquetages pour satisfaire les dépendances" +msgstr "" +"ne pas ré-arranger l'ordre d'installation des paquetages pour satisfaire les " +"dépendances" #: lib/poptI.c:235 msgid "do not suggest missing dependency resolution(s)" @@ -1892,7 +1962,9 @@ msgstr "n'exécuter aucun scriptlet %%triggerpostun" msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" -msgstr "mettre à jour avec un paquetage plus ancien (une m-à -j avec --force fait ça automatiquement" +msgstr "" +"mettre à jour avec un paquetage plus ancien (une m-à -j avec --force fait ça " +"automatiquement" #: lib/poptI.c:281 msgid "print percentages as package installs" @@ -1916,7 +1988,8 @@ msgstr "<vieux>=<nouveau>" #: lib/poptI.c:290 msgid "save erased package files by repackaging" -msgstr "sauvegarder les fichiers du paquetage désinstallé en les ré-empaquetant" +msgstr "" +"sauvegarder les fichiers du paquetage désinstallé en les ré-empaquetant" #: lib/poptI.c:293 msgid "install even if the package replaces installed files" @@ -1928,7 +2001,9 @@ msgstr "réinstalle si le paquetage est déjà installé" #: lib/poptI.c:298 msgid "deinstall new, reinstall old, package(s), back to <date>" -msgstr "désinstaller le(s) nouveau(x), ré-installer le(s) vieux paquetages, comme c'était le cas pour cette <date>" +msgstr "" +"désinstaller le(s) nouveau(x), ré-installer le(s) vieux paquetages, comme " +"c'était le cas pour cette <date>" #: lib/poptI.c:299 msgid "<date>" @@ -1956,7 +2031,8 @@ msgstr "vérifier/demander un package possèdant un fichier" #: lib/poptQV.c:101 msgid "query/verify package(s) with file identifier" -msgstr "questionner/vérifier le(s) paquetage(s) grâce à un identifieur de fichier" +msgstr "" +"questionner/vérifier le(s) paquetage(s) grâce à un identifieur de fichier" #: lib/poptQV.c:103 msgid "query/verify package(s) in group" @@ -1964,7 +2040,8 @@ msgstr "vérifier/questionner le(s) paquetage(s) d'un même groupe" #: lib/poptQV.c:105 msgid "query/verify package(s) with header identifier" -msgstr "questionner/vérifier le(s) paquetage(s) grâce à un identifieur d'entête" +msgstr "" +"questionner/vérifier le(s) paquetage(s) grâce à un identifieur d'entête" #: lib/poptQV.c:107 msgid "query/verify a package file" @@ -1972,7 +2049,8 @@ msgstr "vérifier/questionner un fichier paquetage" #: lib/poptQV.c:109 msgid "query/verify package(s) with package identifier" -msgstr "questionner/vérifier le(s) paquetage(s) grâce à un identifieur de paquetage" +msgstr "" +"questionner/vérifier le(s) paquetage(s) grâce à un identifieur de paquetage" #: lib/poptQV.c:111 msgid "rpm query mode" @@ -1992,7 +2070,9 @@ msgstr "<spec>" #: lib/poptQV.c:117 msgid "query/verify package(s) from install transaction" -msgstr "questionner/vérifier le(s) paquetage(s) à partir de la transaction d'installation" +msgstr "" +"questionner/vérifier le(s) paquetage(s) à partir de la transaction " +"d'installation" #: lib/poptQV.c:119 msgid "query the package(s) triggered by the package" @@ -2117,88 +2197,88 @@ msgstr "signer le(s) paquetage(s) (identique à --addsign)" msgid "generate signature" msgstr "génération de signature" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "paquetage source attendu, paquetage binaire trouvé\n" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "le paquetage source ne contient pas de fichier .spec\n" -#: lib/psm.c:729 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:812 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "%s: %s(%s-%s-%s) redondance ignorée \"%s\".\n" -#: lib/psm.c:820 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "%s: %s(%s-%s-%s) début du scriplet %ssynchrone\n" -#: lib/psm.c:985 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:1008 +#: lib/psm.c:756 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "%s(%s-%s-%s) échec du scriptlet, waitpid(%d) rc %d: %s\n" -#: lib/psm.c:1014 +#: lib/psm.c:762 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "%s(%s-%s-%s) échec du scriplet, code de sortie %d\n" -#: lib/psm.c:1421 +#: lib/psm.c:1191 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s avait %d fichiers, test = %d\n" -#: lib/psm.c:1560 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: échec du scriptlet %s (%d), on saute %s\n" -#: lib/psm.c:1669 +#: lib/psm.c:1439 msgid "Unable to reload signature header\n" msgstr "Impossible de recharger l'entête de signature\n" -#: lib/psm.c:1715 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "utilisateur %s inexistant - utilisation de root\n" -#: lib/psm.c:1724 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "groupe %s inexistant - utilisation de root\n" -#: lib/psm.c:1772 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "échec du déballage de l'archive %s%s: %s\n" -#: lib/psm.c:1773 +#: lib/psm.c:1547 msgid " on file " msgstr " dans fichier " -#: lib/psm.c:1955 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "échec de %s sur le fichier %s: %s\n" -#: lib/psm.c:1958 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "échec %s: %s\n" -#: lib/query.c:118 lib/rpmts.c:552 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "format incorrect: %s\n" @@ -2243,10 +2323,11 @@ msgstr "le paquetage n'as pas de liste de possesseurs/groupes de fichiers\n" #: lib/query.c:299 msgid "package has neither file owner or id lists\n" -msgstr "le paquetage n'a ni la liste des id ni celle des possesseurs de fichiers\n" +msgstr "" +"le paquetage n'a ni la liste des id ni celle des possesseurs de fichiers\n" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1007 lib/rpmts.c:563 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2259,9 +2340,10 @@ msgstr "échec de la requête sur %s\n" #: lib/query.c:453 msgid "old format source packages cannot be queried\n" -msgstr "les vieux formats de paquetage source ne peuvent être sujet aux requêtes\n" +msgstr "" +"les vieux formats de paquetage source ne peuvent être sujet aux requêtes\n" -#: lib/query.c:488 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "%s: n'est pas un paquetage rpm (ni une list de paquetages): %s\n" @@ -2330,7 +2412,7 @@ msgstr "numéro d'article de paquetage: %u\n" msgid "record %u could not be read\n" msgstr "impossible de lire l'article %u\n" -#: lib/query.c:766 lib/rpminstall.c:776 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "le paquetage %s n'est pas installé\n" @@ -2352,87 +2434,87 @@ msgstr "%s: échec de l'ouverture: %s\n" msgid "makeTempFile failed\n" msgstr "échec de makeTempFile\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: échec de Fwrite: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, c-format msgid "%s: not an rpm package\n" msgstr "%s: n'est pas un paquetage rpm\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: ne peut signer un emballage v1\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: ne peut resigner un emballage v2\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "%s: déjà signé par la clé d'ID %s, ignoré\n" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: échec de writeLead: %s\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: échec de rpmWriteSignature: %s\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, c-format msgid "%s: import read failed.\n" msgstr "%s: échec de la lecture d'import.\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, c-format msgid "%s: import failed.\n" msgstr "%s: échec de l'import.\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, c-format msgid "%s: headerRead failed\n" msgstr "%s: échec de headerRead\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: échec de headerGetEntry\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Aucune signature disponible (v1.0 RPM)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "PAS OK" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr " (CLES MANQUANTES:" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr " (CLES NONCREDIBLE:" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "OK" @@ -2450,7 +2532,8 @@ msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -"La dépendance \"B\" a besoin d'une epoch (on suppose qu'elle est la même que pour \"A\")\n" +"La dépendance \"B\" a besoin d'une epoch (on suppose qu'elle est la même que " +"pour \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" #: lib/rpmds.c:904 @@ -2464,31 +2547,36 @@ msgstr "" msgid "package %s has unsatisfied %s: %s\n" msgstr "le paquetage %s a un(e) %s non-satisfaites: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "%s ignoré à cause du drapeau missingok\n" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "========== relogements\n" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, c-format msgid "%5d exclude %s\n" msgstr "%5d exclus %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d reloge %s -> %s\n" -#: lib/rpmfi.c:794 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "exclusion de %s %s\n" -#: lib/rpmfi.c:804 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "relogement de %s vers %s\n" -#: lib/rpmfi.c:891 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "relogement du répertoire %s vers %s\n" @@ -2539,7 +2627,7 @@ msgstr " ... en tant que %s\n" msgid "skipping %s - transfer failed - %s\n" msgstr "%s ignoré - échec du téléchargement - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:861 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "%s ne peut être installé\n" @@ -2559,61 +2647,66 @@ msgstr "erreur en lisant %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "le fichier %s demande une version plus récente de RPM\n" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d paquetage(s) source(s) et %d paquetage(s) binaire(s) trouvé(s)\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:808 lib/rpminstall.c:1228 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 msgid "Failed dependencies:\n" msgstr "Dépendances requises:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr " Résolutions suggérées:\n" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "installation des paquetages binaires\n" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "ne peut ouvrir le fichier %s: %s\n" -#: lib/rpminstall.c:785 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spécifie plusieurs paquetages\n" -#: lib/rpminstall.c:845 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir %s: %s\n" -#: lib/rpminstall.c:851 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "Installation de %s\n" -#: lib/rpminstall.c:1222 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" -msgstr "Roulement arrière des paquetages (+%d/-%d) jusqu'à %-24.24s (0x%08x):\n" +msgstr "" +"Roulement arrière des paquetages (+%d/-%d) jusqu'à %-24.24s (0x%08x):\n" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "échec de lecture: %s (%d)\n" #: lib/rpmlibprov.c:29 msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions." -msgstr "Les dépendances de type PreReq:, Provides: et Obsoletes: supportent les versions." +msgstr "" +"Les dépendances de type PreReq:, Provides: et Obsoletes: supportent les " +"versions." #: lib/rpmlibprov.c:32 msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path." -msgstr "Le(s) nom(s) de fichier sont stockés en tant que triplets (NomRep,NomFich,IndexRep), pas en tant que chemin." +msgstr "" +"Le(s) nom(s) de fichier sont stockés en tant que triplets (NomRep,NomFich," +"IndexRep), pas en tant que chemin." #: lib/rpmlibprov.c:35 msgid "package payload is compressed using bzip2." @@ -2621,7 +2714,8 @@ msgstr "La charge utile du paquetage est compressée avec bzip2." #: lib/rpmlibprov.c:38 msgid "package payload file(s) have \"./\" prefix." -msgstr "le(s) fichier(s) de la charge utile du paquetage ont \"./\" comme préfixe." +msgstr "" +"le(s) fichier(s) de la charge utile du paquetage ont \"./\" comme préfixe." #: lib/rpmlibprov.c:41 msgid "package name-version-release is not implicitly provided." @@ -2633,7 +2727,8 @@ msgstr "les tags d'entête sont toujours triés après avoir été chargés." #: lib/rpmlibprov.c:47 msgid "the scriptlet interpreter can use arguments from header." -msgstr "l'interprète du scriptlet peut utiliser des arguments à partir des entêtes." +msgstr "" +"l'interprète du scriptlet peut utiliser des arguments à partir des entêtes." #: lib/rpmlibprov.c:50 msgid "a hardlink file set may be installed without being complete." @@ -2641,7 +2736,9 @@ msgstr "un lien en dur pourrait être installé sans être complet." #: lib/rpmlibprov.c:53 msgid "package scriptlets may access the rpm database while installing." -msgstr "les scriptlets du paquetage pourrait accéder à la base de données rpm pendant l'installation." +msgstr "" +"les scriptlets du paquetage pourrait accéder à la base de données rpm " +"pendant l'installation." #. @observer@ #: lib/rpmps.c:200 @@ -2671,12 +2768,15 @@ msgstr "le chemin %s du paquetage %s n'est pas relogeable" #: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" -msgstr "le fichier %s entre en conflit avec les tentatives d'installation de %s et %s" +msgstr "" +"le fichier %s entre en conflit avec les tentatives d'installation de %s et %s" #: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" -msgstr "le fichier %s de l'installation de %s entre en conflit avec le fichier du paquetage %s" +msgstr "" +"le fichier %s de l'installation de %s entre en conflit avec le fichier du " +"paquetage %s" #: lib/rpmps.c:238 #, c-format @@ -2686,17 +2786,21 @@ msgstr "le paquetage %s (plus récent que %s) est déjà installé" #: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" -msgstr "installer le paquetage %s nécessite %ld%co sur le système de fichiers %s" +msgstr "" +"installer le paquetage %s nécessite %ld%co sur le système de fichiers %s" #: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" -msgstr "installer le paquetage %s nécessite %ld i-noeuds sur le système de fichiers %s" +msgstr "" +"installer le paquetage %s nécessite %ld i-noeuds sur le système de fichiers %" +"s" #: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" -msgstr "échec du(des) appel(s) système(s) de la pré-transaction du paquetage %s: %s" +msgstr "" +"échec du(des) appel(s) système(s) de la pré-transaction du paquetage %s: %s" #: lib/rpmps.c:262 #, c-format @@ -2812,50 +2916,50 @@ msgstr "Impossible de lire %s, HOME trop gros.\n" msgid "Unable to open %s for reading: %s.\n" msgstr "Impossible d'ouvrir %s en lecture: %s.\n" -#: lib/rpmts.c:159 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir la base de données Package dans %s\n" -#: lib/rpmts.c:243 +#: lib/rpmts.c:246 #, c-format msgid "extra '(' in package label: %s\n" msgstr "'(' supplémentaire dans le label du paquetage: %s\n" -#: lib/rpmts.c:261 +#: lib/rpmts.c:264 #, c-format msgid "missing '(' in package label: %s\n" msgstr "'(' manquante dans le label du paquetage: %s\n" -#: lib/rpmts.c:269 +#: lib/rpmts.c:272 #, c-format msgid "missing ')' in package label: %s\n" msgstr "')' manquante dans le label du paquetage: %s\n" -#: lib/rpmts.c:442 +#: lib/rpmts.c:448 #, c-format msgid "cannot open Solve database in %s\n" msgstr "Impossible d'ouvrir la base de données Solve dans %s\n" -#: lib/rpmts.c:584 +#: lib/rpmts.c:590 #, c-format msgid "Adding: %s\n" msgstr "Ajout de: %s\n" -#: lib/rpmts.c:596 +#: lib/rpmts.c:602 #, c-format msgid "Suggesting: %s\n" msgstr "Suggestion: %s\n" -#: lib/rpmts.c:1064 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "systèmes de fichiers montés:\n" -#: lib/rpmts.c:1066 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:1122 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "%5d 0x%04x %5u %12ld %12ld %s\n" @@ -2975,57 +3079,56 @@ msgstr "%%_signature spécifiée invalide dans le fichier de macros\n" #: lib/signature.c:911 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" -msgstr "Vous devez affecter une valeur à \"%%_gpg_name\" dans votre fichier de macros\n" +msgstr "" +"Vous devez affecter une valeur à \"%%_gpg_name\" dans votre fichier de " +"macros\n" #: lib/signature.c:926 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" -msgstr "Vous devez affecter une valeur à \"%%_pgp_name\" dans votre fichier de macros\n" +msgstr "" +"Vous devez affecter une valeur à \"%%_pgp_name\" dans votre fichier de " +"macros\n" #: lib/signature.c:975 msgid "Header+Payload size: " msgstr "Taille de Entête+Charge_utile: " -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "Somme MD5: " -#: lib/signature.c:1071 +#: lib/signature.c:1075 msgid "Header SHA1 digest: " msgstr "Hachage de l'entête SHA1: " -#: lib/signature.c:1146 +#: lib/signature.c:1152 msgid "V3 RSA/MD5 signature: " msgstr "signature V3 RSA/MD5: " -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "Entête " -#: lib/signature.c:1264 +#: lib/signature.c:1274 msgid "V3 DSA signature: " msgstr "signature V3 DSA: " -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "Verification de signature: MAUVAIS PARAMETRES\n" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "Somme MD5 erronée: NONSUPPORTE\n" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Signature: INCONNUE (%d)\n" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "%s ignoré à cause du drapeau missingok\n" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "répertoire %s exclus\n" @@ -3038,7 +3141,7 @@ msgstr "répertoire %s exclus\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "vérification de santé de %d éléments\n" @@ -3051,7 +3154,7 @@ msgstr "vérification de santé de %d éléments\n" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "calcul de %d empreintes de fichier\n" @@ -3059,7 +3162,7 @@ msgstr "calcul de %d empreintes de fichier\n" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1232 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "calcul de la disposition des fichiers\n" @@ -3111,7 +3214,9 @@ msgstr "vérif. db index %s/%s\n" #: rpmdb/db3.c:986 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" -msgstr "trouvés(%d) mutex posix non-partagés, rajout de DB_PRIVATE, utilisation des verrous fcntl\n" +msgstr "" +"trouvés(%d) mutex posix non-partagés, rajout de DB_PRIVATE, utilisation des " +"verrous fcntl\n" #: rpmdb/db3.c:1090 #, c-format @@ -3241,7 +3346,9 @@ msgstr "initialiser la base de données" #: rpmdb/poptDB.c:20 msgid "rebuild database inverted lists from installed package headers" -msgstr "refaire les listes inversées de la base de données à partir des entêtes des paquetages installés" +msgstr "" +"refaire les listes inversées de la base de données à partir des entêtes des " +"paquetages installés" #: rpmdb/poptDB.c:23 msgid "verify database files" @@ -3266,161 +3373,166 @@ msgstr "ne peut ouvrir l'index %s en utilisant db%d - %s (%d)\n" msgid "cannot open %s index\n" msgstr "ne peut ouvrir l'index %s\n" -#: rpmdb/rpmdb.c:1009 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "aucun dbpath n'a été fourni\n" -#: rpmdb/rpmdb.c:1283 rpmdb/rpmdb.c:1412 rpmdb/rpmdb.c:1463 rpmdb/rpmdb.c:2406 -#: rpmdb/rpmdb.c:2522 rpmdb/rpmdb.c:3251 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "erreur(%d) en attrapant les articles \"%s\" de l'index %s\n" -#: rpmdb/rpmdb.c:1657 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: on saute" -#: rpmdb/rpmdb.c:1667 +#: rpmdb/rpmdb.c:1577 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "erreur(%d) en stockant l'article nº%d dans %s\n" -#: rpmdb/rpmdb.c:2299 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: on saute" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: l'entête nº%u endommagé a été téléchargé -- ignoré.\n" -#: rpmdb/rpmdb.c:2610 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: impossible de lire l'entête à 0x%x\n" -#: rpmdb/rpmdb.c:2673 +#: rpmdb/rpmdb.c:2583 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" -msgstr "erreur(%d) en affectant l'article de l'entête nº%d pour l'enlèvement de %s\n" +msgstr "" +"erreur(%d) en affectant l'article de l'entête nº%d pour l'enlèvement de %s\n" -#: rpmdb/rpmdb.c:2788 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "enlèvement \"%s\" à l'index %s.\n" -#: rpmdb/rpmdb.c:2792 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "enlèvement de %d entrées à l'index %s.\n" -#: rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:2730 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "erreur(%d) en affectant les articles \"%s\" de l'index %s\n" -#: rpmdb/rpmdb.c:2841 +#: rpmdb/rpmdb.c:2751 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "erreur(%d) en stockant l'article \"%s\" dans %s\n" -#: rpmdb/rpmdb.c:2851 +#: rpmdb/rpmdb.c:2761 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "erreur(%d) en enlevant l'article \"%s\" de %s\n" -#: rpmdb/rpmdb.c:3000 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "erreur en allouant une nouvelle instance de paquetage\n" -#: rpmdb/rpmdb.c:3054 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "rpmdbAdd: on saute" -#: rpmdb/rpmdb.c:3226 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "rajout de \"%s\" à l'index %s.\n" -#: rpmdb/rpmdb.c:3230 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "rajout de %d entrées à l'index %s.\n" -#: rpmdb/rpmdb.c:3270 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "erreur(%d) en stockant l'article %s dans %s\n" -#: rpmdb/rpmdb.c:3671 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "enlèvement de %s après la reconstruction réussie en db3.\n" -#: rpmdb/rpmdb.c:3709 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "aucun dbpath fourni" -#: rpmdb/rpmdb.c:3741 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "reconstruction de la base de données de %s en %s\n" -#: rpmdb/rpmdb.c:3745 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "la base de données temporarire %s existe déjà \n" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "création du répertoire %s\n" -#: rpmdb/rpmdb.c:3753 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "création du répertoire %s: %s\n" -#: rpmdb/rpmdb.c:3760 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ouverture d'une vieille base de données avec dbapi %d\n" -#: rpmdb/rpmdb.c:3773 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ouverture d'une nouvelle base de données avec dbapi %d\n" -#: rpmdb/rpmdb.c:3802 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "l'entête nº%u dans la base de données n'est pas bon -- ignoré.\n" -#: rpmdb/rpmdb.c:3842 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "impossible d'ajouter l'article qui était au départ à %u\n" -#: rpmdb/rpmdb.c:3860 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" -msgstr "Ne peut reconstruire la base de données: la base originale reste telle qu'elle est\n" +msgstr "" +"Ne peut reconstruire la base de données: la base originale reste telle " +"qu'elle est\n" -#: rpmdb/rpmdb.c:3868 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "Ne peut remplacer la vieille base de données par la nouvelle!\n" -#: rpmdb/rpmdb.c:3870 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" -msgstr "remplacer les fichiers dans %s avec les fichiers de %s pour faire une récupération" +msgstr "" +"remplacer les fichiers dans %s avec les fichiers de %s pour faire une " +"récupération" -#: rpmdb/rpmdb.c:3880 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "destruction du répertoire %s\n" -#: rpmdb/rpmdb.c:3882 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "Ne peut détruire le répertoire %s: %s\n" @@ -3431,144 +3543,144 @@ msgid "======================== active %d empty %d\n" msgstr "======================== %d actif(s) %d vide(s)\n" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(vide)" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(vide)\n" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "La macro %%%s a un corps sans fin\n" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "La macro %%%s a un nom illégal (%%define)\n" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "La macro %%%s a des options non-terminées\n" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "La macro %%%s a un corps vide\n" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "La macro %%%s ne peut être expansée\n" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "La macro %%%s a un nom illégal (%%undefine)\n" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "La macro %%%s (%s) n'est plus utilisée en dessous du niveau %d\n" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Option inconnue %c dans %s(%s)\n" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Profondeur de récursion(%d) plus grande que le max(%d)\n" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c non terminé: %s\n" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Un % est suivi d'une macro in-analysable\n" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Macro %%%.*s non trouvé, ignoré\n" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "Tampon cible en surcharge\n" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "Fichier %s: %s\n" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Le fichier %s est plus petit que %u octets\n" -#: rpmio/rpmio.c:637 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "Succès" -#: rpmio/rpmio.c:640 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "Mauvaise réponse du serveur" -#: rpmio/rpmio.c:643 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "Erreur d'E/S avec le serveur" -#: rpmio/rpmio.c:646 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "Timeout du serveur" -#: rpmio/rpmio.c:649 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "Impossible de résoudre l'adresse IP du serveur" -#: rpmio/rpmio.c:652 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "Impossible de retrouver le nom d'hôte du serveur" -#: rpmio/rpmio.c:655 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "Impossible de se connecter au serveur" -#: rpmio/rpmio.c:658 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "Impossible d'établir une connexion de données avec le serveur" -#: rpmio/rpmio.c:661 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "erreur d'E/S dans le fichier local" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "Erreur en mettant le serveur distant en mode passif" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "Fichier non trouvé sur le serveur" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "Abandon en cours" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "Erreur inconnue ou inattendue" -#: rpmio/rpmio.c:1372 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "connexion à %s en tant que %s, mdp %s\n" @@ -3638,7 +3750,9 @@ msgstr "ne pas vérifier la signature de l'entete+charge_utile" #: tools/rpmcache.c:518 msgid "don't update cache database, only print package paths" -msgstr "ne pas mettre à jour le cache de la base de données, afficher seulement les chemins du paquetage" +msgstr "" +"ne pas mettre à jour le cache de la base de données, afficher seulement les " +"chemins du paquetage" #: tools/rpmcache.c:522 msgid "follow command line symlinks" @@ -3690,6 +3804,7 @@ msgstr "%s: échec de l'opération sur le cache: ec %d.\n" #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: échec de la lecture de la liste de paquetages: %s\n" + #: ../rpmpopt:34 ../rpmpopt:290 ../rpmpopt:363 msgid "list install/erase scriptlets from package(s)" msgstr "lister les scriptlets de (dés)installation du(des) paquetage(s)" @@ -3732,19 +3847,26 @@ msgstr "lister les scripts trigger du(des) paquetage(s)" #: ../rpmpopt:84 ../rpmpopt:331 ../rpmpopt:403 msgid "list package(s) by install time, most recent first" -msgstr "lister le(s) paquetage(s) trié(s) par date d'installation, le plus récent d'abord" +msgstr "" +"lister le(s) paquetage(s) trié(s) par date d'installation, le plus récent " +"d'abord" #: ../rpmpopt:87 ../rpmpopt:334 ../rpmpopt:406 msgid "list all files from each package" msgstr "lister tous les fichiers de chaque paquetages" #: ../rpmpopt:90 ../rpmpopt:93 -msgid "find package name that contains a provided capability (needs rpmdb-redhat package installed)" -msgstr "trouver le nom du paquetage qui contient une fourniture (a besoin du paquetage rpmdb-redhat)" +msgid "" +"find package name that contains a provided capability (needs rpmdb-redhat " +"package installed)" +msgstr "" +"trouver le nom du paquetage qui contient une fourniture (a besoin du " +"paquetage rpmdb-redhat)" #: ../rpmpopt:103 msgid "set buildroot <policy> (e.g. compress man pages)" -msgstr "fixer une <politique> du buildroot (par ex. la compression des pages de man)" +msgstr "" +"fixer une <politique> du buildroot (par ex. la compression des pages de man)" #: ../rpmpopt:104 msgid "<policy>" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -107,7 +107,7 @@ msgstr "" msgid "%s: %s\n" msgstr "" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "" @@ -327,271 +327,271 @@ msgstr "" msgid "no arguments given" msgstr "" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" msgstr "" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:518 +#: build/files.c:502 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1763 +#: build/files.c:1752 #, c-format msgid "%s: public key read failed.\n" msgstr "" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1839 +#: build/files.c:1828 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:2374 +#: build/files.c:2363 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "" @@ -701,7 +701,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -731,7 +731,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -791,17 +791,17 @@ msgstr "" msgid "line %d: Bad option %s: %s\n" msgstr "" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "" @@ -882,7 +882,7 @@ msgstr "" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "" @@ -1062,31 +1062,31 @@ msgstr "" msgid "Unclosed %%if\n" msgstr "" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 msgid "No compatible architectures found for build\n" msgstr "" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "" @@ -1211,17 +1211,17 @@ msgstr "" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 msgid "don't verify package digest(s)" msgstr "" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 msgid "don't verify database header(s) when retrieved" msgstr "" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 msgid "don't verify package signature(s)" msgstr "" @@ -1316,7 +1316,7 @@ msgstr "" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr "" @@ -1325,73 +1325,73 @@ msgstr "" msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:438 +#: lib/depends.c:441 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:467 +#: lib/depends.c:470 msgid "(db files)" msgstr "" -#: lib/depends.c:480 +#: lib/depends.c:483 msgid "(db provides)" msgstr "" -#: lib/depends.c:493 +#: lib/depends.c:496 msgid "(db package)" msgstr "" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "" @@ -1403,88 +1403,88 @@ msgstr "" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 msgid "(not a blob)" msgstr "" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 msgid "(not an OpenPGP signature)" msgstr "" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "" -#: lib/fs.c:213 +#: lib/fs.c:216 #, c-format msgid "%5d 0x%04x %s %s\n" msgstr "" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, c-format msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1499,7 +1499,7 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "" @@ -1537,171 +1537,171 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:843 +#: lib/package.c:852 #, c-format msgid "%s: headerRead failed: %s" msgstr "" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 msgid "print macro expansion of EXPR" msgstr "" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 msgid "send stdout to CMD" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 msgid "use ROOT as top level directory" msgstr "" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 msgid "use threads for file state machine" msgstr "" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 msgid "debug package state machine" msgstr "" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 msgid "use threads for package state machine" msgstr "" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2113,88 +2113,88 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "" -#: lib/psm.c:747 +#: lib/psm.c:762 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1418 +#: lib/psm.c:1439 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr "" -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2242,7 +2242,7 @@ msgid "package has neither file owner or id lists\n" msgstr "" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2257,71 +2257,76 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "" #: lib/query.c:535 #, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "" + +#: lib/query.c:561 +#, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, c-format msgid "malformed %s: %s\n" msgstr "" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, c-format msgid "no package matches %s: %s\n" msgstr "" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2343,141 +2348,146 @@ msgstr "" msgid "makeTempFile failed\n" msgstr "" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, c-format msgid "%s: not an rpm package\n" msgstr "" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, c-format msgid "%s: import read failed.\n" msgstr "" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, c-format msgid "%s: import failed.\n" msgstr "" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr "" -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr "" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "" @@ -2528,7 +2538,7 @@ msgstr "" msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2548,50 +2558,50 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "" @@ -2801,35 +2811,50 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, c-format +msgid "extra '(' in package label: %s\n" +msgstr "" + +#: lib/rpmts.c:264 +#, c-format +msgid "missing '(' in package label: %s\n" +msgstr "" + +#: lib/rpmts.c:272 +#, c-format +msgid "missing ')' in package label: %s\n" +msgstr "" + +#: lib/rpmts.c:448 #, c-format msgid "cannot open Solve database in %s\n" msgstr "" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, c-format msgid "Adding: %s\n" msgstr "" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, c-format msgid "Suggesting: %s\n" msgstr "" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -2960,46 +2985,41 @@ msgstr "" msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1146 +#: lib/signature.c:1152 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3012,7 +3032,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3025,7 +3045,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3033,16 +3053,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, c-format msgid "missing %c %s" msgstr "" -#: lib/verify.c:394 +#: lib/verify.c:397 #, c-format msgid "Unsatisfied dependencies for %s: " msgstr "" @@ -3130,71 +3150,80 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3216,176 +3245,176 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, c-format msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -3396,144 +3425,144 @@ msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -108,7 +108,7 @@ msgstr "" msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM útgáfa %s\n" @@ -330,271 +330,271 @@ msgstr "" msgid "no arguments given" msgstr "" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "Get ekki opnað tempi skrá.\n" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "Gat ekki keyrt %s (%s): %s\n" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" msgstr "" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "vantar '(' í %s %s\n" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "vantar ')' í %s %s\n" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "Ógilt %s tákn: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "vantar '(' í %s %s\n" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "Tvær skrár á einni línu: %s\n" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "Skráin er tvítekin: %s\n" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "Skráin fannst ekki: %s\n" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: Fseek brást: %s\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1839 +#: build/files.c:1828 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "Gat ekki opnað PreUn skrá: %s\n" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "Skráin fannst ekki með 'glob': %s\n" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Gat ekki opnað %%files skrána %s: %s\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "lína: %s\n" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ógild skrá %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:2374 +#: build/files.c:2363 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "" @@ -708,7 +708,7 @@ msgstr "Get ekki lesið haus úr %s: %s\n" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "Get ekki ritað í pakka: %s\n" @@ -738,7 +738,7 @@ msgstr "Get ekki lesið innihald %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Get ekki ritað innihald í %s: %s\n" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaði: %s\n" @@ -798,17 +798,17 @@ msgstr "" msgid "line %d: Bad option %s: %s\n" msgstr "lína %d: Óleyfilegur rofi %s: %s\n" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "" @@ -889,7 +889,7 @@ msgstr "lína %d: Tómt tag: %s\n" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "lína %d: Ólöglegt tákn '-' í %s: %s\n" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "" @@ -1069,31 +1069,31 @@ msgstr "Get ekki opnað %s: %s\n" msgid "Unclosed %%if\n" msgstr "" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 msgid "No compatible architectures found for build\n" msgstr "" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "" @@ -1219,19 +1219,19 @@ msgstr "ekki skoða pakkaskilyrðin" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "ekki skoða pakkaskilyrðin" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "ekki skoða pakkaskilyrðin" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1327,7 +1327,7 @@ msgstr "" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr "" @@ -1336,74 +1336,74 @@ msgstr "" msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:438 +#: lib/depends.c:441 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:467 +#: lib/depends.c:470 msgid "(db files)" msgstr "" -#: lib/depends.c:480 +#: lib/depends.c:483 msgid "(db provides)" msgstr "" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "uppfæra pakka" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "" @@ -1415,89 +1415,89 @@ msgstr "" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 msgid "(not a blob)" msgstr "" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "búa til undirskrift" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() skilaði ekki stærð: %s\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "gat ekki skoðað %s: %s\n" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "Skrá %s: %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "%s vistað sem %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir %s brást: %s\n" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s gat ekki eytt %s: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "%s búið til sem %s\n" @@ -1512,7 +1512,7 @@ msgstr "gat ekki búið til %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "get ekki ritað í %%%s %s\n" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "" @@ -1550,173 +1550,173 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s rmdir %s brást: %s\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: Fseek brást: %s\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "prenta útvíkkun fjölva <expr>+" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "senda frálag í <skipun>" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 msgid "use ROOT as top level directory" msgstr "" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "sýna endanlega rpmrc og stillingar fjölva" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "prenta útgáfunúmer rpm sem verið er að nota" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 msgid "use threads for file state machine" msgstr "" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 msgid "debug package state machine" msgstr "" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 msgid "use threads for package state machine" msgstr "" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2140,89 +2140,89 @@ msgstr "" msgid "generate signature" msgstr "búa til undirskrift" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "" -#: lib/psm.c:747 +#: lib/psm.c:762 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Get ekki lesið haus úr %s: %s\n" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr "" -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2270,7 +2270,7 @@ msgid "package has neither file owner or id lists\n" msgstr "" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2285,71 +2285,76 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "Óþekkt tegund táknmyndar: %s\n" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Get ekki lesið %s: %s.\n" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2371,141 +2376,146 @@ msgstr "" msgid "makeTempFile failed\n" msgstr "" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: Fseek brást: %s\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: Fseek brást: %s\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: Fseek brást: %s\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: gat ekki lesið manifest: %s\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr "" -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr "" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "%5d færa %s -> %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d færa %s -> %s\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "lína %d: %s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, fuzzy, c-format msgid "relocating %s to %s\n" msgstr "%5d færa %s -> %s\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "%5d færa %s -> %s\n" @@ -2557,7 +2567,7 @@ msgstr "" msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2577,51 +2587,51 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "gat ekki útbúið pakkaskilyrði:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "" @@ -2831,35 +2841,50 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Get ekki opnað %s til lesturs: %s.\n" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í %s\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, c-format +msgid "extra '(' in package label: %s\n" +msgstr "" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "vantar '(' í %s %s\n" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "vantar '(' í %s %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í %s\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "lína: %s\n" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, c-format msgid "Suggesting: %s\n" msgstr "" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -2990,47 +3015,42 @@ msgstr "" msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "ekki yfirfara SHA1 undirritunina" -#: lib/signature.c:1146 +#: lib/signature.c:1152 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3043,7 +3063,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3056,7 +3076,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3064,16 +3084,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "vantar %s" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Óuppfyllt pakkaskilyrði fyrir %s-%s-%s: " @@ -3161,71 +3181,80 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3247,176 +3276,176 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "get ekki opnað %s index með db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, c-format msgid "cannot open %s index\n" msgstr "get ekki opnað %s index\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -3427,144 +3456,144 @@ msgid "======================== active %d empty %d\n" msgstr "======================== virkt %d tómt %d\n" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(tómt)" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(tómt)\n" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Óþekkt viðfang %c í %s(%s)\n" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Fjölvi %%%.*s fannst ekki. Sleppi\n" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "Skrá %s: %s\n" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Skráin %s er minni en %u bæti\n" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "Tókst" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "Þjónninn svaraði rangt" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "Les/ritvilla á þjóninum" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "Þjónninn tímaði út" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "Gat ekki flett upp vistfangi þjónsins" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "Gat ekki flett upp heiti þjónsins" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "Gat ekki tengst þjóninum" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "Gat ekki opnað gagnatengingu við þjóninn" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "Les/ritvilla í skrána" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "Ekki tókst að fá þjóninn í \"passive\" ham" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "Skráin fannst ekki á þjóninum" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "Er að hætta við" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "Óþekkt eða óvænt villa" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "tengist %s sem %s með aðgangsorði %s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -116,7 +116,7 @@ msgstr "" msgid "%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM ¥Ð¡¼¥¸¥ç¥ó %s\n" @@ -359,284 +359,284 @@ msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó" msgid "no arguments given" msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 #, fuzzy msgid "Unable to open temp file.\n" msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó" -#: build/build.c:218 +#: build/build.c:220 #, fuzzy, c-format msgid "Executing(%s): %s\n" msgstr "¼Â¹ÔÃæ: %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, fuzzy, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "%s ¤Î¼Â¹Ô¤Ë¼ºÇÔ (%s)" -#: build/build.c:237 +#: build/build.c:239 #, fuzzy, c-format msgid "Bad exit status from %s (%s)\n" msgstr "%s ¤ÎÉÔÀµ¤Ê½ªÎ»¥¹¥Æ¡¼¥¿¥¹ (%s)" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" msgstr "" -#: build/expression.c:225 +#: build/expression.c:228 #, fuzzy msgid "syntax error while parsing ==\n" msgstr "¹½Ê¸²òÀÏÃæ¤Îʸˡ¥¨¥é¡¼ ==" -#: build/expression.c:255 +#: build/expression.c:258 #, fuzzy msgid "syntax error while parsing &&\n" msgstr "¹½Ê¸²òÀÏÃæ¤Îʸˡ¥¨¥é¡¼ &&" -#: build/expression.c:264 +#: build/expression.c:267 #, fuzzy msgid "syntax error while parsing ||\n" msgstr "¹½Ê¸²òÀÏÃæ¤Îʸˡ¥¨¥é¡¼ ||" -#: build/expression.c:307 +#: build/expression.c:310 #, fuzzy msgid "parse error in expression\n" msgstr "¼°Ãæ¤Ç¹½Ê¸²òÀÏ¥¨¥é¡¼" -#: build/expression.c:347 +#: build/expression.c:352 #, fuzzy msgid "unmatched (\n" msgstr "°ìÃפ·¤Ê¤¤ (" -#: build/expression.c:377 +#: build/expression.c:382 #, fuzzy msgid "- only on numbers\n" msgstr "- ¿ô¤Î¤ß" -#: build/expression.c:393 +#: build/expression.c:398 #, fuzzy msgid "! only on numbers\n" msgstr "! ¿ô¤Î¤ß" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 #, fuzzy msgid "types must match\n" msgstr "·¿¤Ï°ìÃפ·¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: build/expression.c:453 +#: build/expression.c:459 #, fuzzy msgid "* / not suported for strings\n" msgstr "* / ¤Ïʸ»úÎóÍѤ˥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: build/expression.c:510 +#: build/expression.c:517 #, fuzzy msgid "- not suported for strings\n" msgstr "- ¤Ïʸ»úÎóÍѤ˥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: build/expression.c:668 +#: build/expression.c:676 #, fuzzy msgid "&& and || not suported for strings\n" msgstr "&& ¤È || ¤Ïʸ»úÎóÍѤ˥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 #, fuzzy msgid "syntax error in expression\n" msgstr "¼°Ãæ¤Çʸˡ¥¨¥é¡¼" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK ¼ºÇÔ: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "%s %s ¤Ç '('¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "')' ¤¬¤¢¤ê¤Þ¤»¤ó %s(%s " -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "̵¸ú¤Ê %s ¤Î¥È¡¼¥¯¥ó: %s" -#: build/files.c:518 +#: build/files.c:502 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "%s %s ¤Ç '('¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: build/files.c:575 +#: build/files.c:559 #, fuzzy, c-format msgid "Non-white space follows %s(): %s\n" msgstr "%s() ¤Ë³¤¯¶õÇò¤¬¤¢¤ê¤Þ¤»¤ó: %s" -#: build/files.c:613 +#: build/files.c:597 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "ÉÔÀµ¤Êʸˡ: %s(%s)" -#: build/files.c:623 +#: build/files.c:607 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "ÉÔÀµ¤Ê¥â¡¼¥É¥¹¥Ú¥Ã¥¯: %s(%s)" -#: build/files.c:635 +#: build/files.c:619 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "ÉÔÀµ¤Ê¥Ç¥£¥ì¥¯¥È¥ê¥â¡¼¥É¥¹¥Ú¥Ã¥¯: %s(%s)" -#: build/files.c:793 +#: build/files.c:777 #, fuzzy, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "°Û¾ï¤Ê¥í¥«¡¼¥ëĹ: \"%.*s\" %%lang(%s)" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, fuzzy, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Ê£¿ô¤Î¥í¥«¡¼¥ë %.*s %%lang(%s)" -#: build/files.c:933 +#: build/files.c:917 #, fuzzy, c-format msgid "Hit limit for %%docdir\n" msgstr "%%docdir ¤Î¸Â³¦¤Ë㤷¤Þ¤·¤¿" -#: build/files.c:939 +#: build/files.c:925 #, fuzzy, c-format msgid "Only one arg for %%docdir\n" msgstr "%%docdir ¤Î°ú¿ô¤Ï1¤Ä¤Î¤ß¤Ç¤¹" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "1¹Ô¤Ë2¤Ä¤Î¥Õ¥¡¥¤¥ë: %s" -#: build/files.c:987 +#: build/files.c:976 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "¥Õ¥¡¥¤¥ë¤Ï \"/\" ¤«¤é»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s" -#: build/files.c:1000 +#: build/files.c:989 #, fuzzy, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "¾¤Î¥Õ¥©¡¼¥à¤ÇÆÃÊÌ¤Ê %%doc ¤òº®¤¼¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó: %s" -#: build/files.c:1152 +#: build/files.c:1141 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "¥Õ¥¡¥¤¥ë¤¬2²óɽµ¤µ¤ì¤Æ¤¤¤Þ¤¹: %s" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1531 +#: build/files.c:1520 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "¥Õ¥¡¥¤¥ë¤Ï prefix (%s) ¤È°ìÃפ·¤Þ¤»¤ó: %s" -#: build/files.c:1555 +#: build/files.c:1544 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "¥Õ¥¡¥¤¥ë¤ÏÀèƬ¤Ë \"/\" ¤¬É¬ÍפǤ¹: %s" -#: build/files.c:1839 +#: build/files.c:1828 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "%d ¹ÔÌÜ: ¥Ð¡¼¥¸¥ç¥ó¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó(by glob): %s" -#: build/files.c:1916 +#: build/files.c:1905 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó: %s" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "¹ÔÌÜ: %s" -#: build/files.c:2318 +#: build/files.c:2307 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "ÉÔÀµ¤Ê½êͼÔ/¥°¥ë¡¼¥×: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷Ãæ\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½èÍýÃæ: %s-%s-%s\n" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "¥Û¥¹¥È̾¤òÀµ¼°¤Ê¤â¤Î¤Ë¤Ç¤¤Þ¤»¤ó: %s\n" @@ -751,7 +751,7 @@ msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó: %s" msgid "Could not open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" @@ -781,7 +781,7 @@ msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó: %s" msgid "Unable to write payload to %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤¹þ¤ßÃæ: %s\n" @@ -841,17 +841,17 @@ msgstr "%d ¹ÔÌÜ: %%description ¤Î²òÀÏ¥¨¥é¡¼: %s" msgid "line %d: Bad option %s: %s\n" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó %s:%s" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, fuzzy, c-format msgid "line %d: Too many names: %s\n" msgstr "%d ¹ÔÌÜ: ̾Á°¤¬Â¿¤¹¤®¤Þ¤¹: %s" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, fuzzy, c-format msgid "line %d: Package does not exist: %s\n" msgstr "%d ¹ÔÌÜ: ¥Ñ¥Ã¥±¡¼¥¸¤¬Â¸ºß¤·¤Þ¤»¤ó: %s" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, fuzzy, c-format msgid "line %d: Second description\n" msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤÎÀâÌÀ" @@ -932,7 +932,7 @@ msgstr "%d ¹ÔÌÜ: ¶õ¤Î¥¿¥°: %s" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "%d ¹ÔÌÜ: %s Ãæ¤ËÉÔÀµ¤Êʸ»ú '-' : %s" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, fuzzy, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "%d ¹ÔÌÜ: BuildRoot ¤Ï \"/\" ¤Ë¤¹¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó: %s" @@ -1115,32 +1115,32 @@ msgstr "¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó: %s\n" msgid "Unclosed %%if\n" msgstr "%%if ¤¬ÊĤ¸¤Æ¤¤¤Þ¤»¤ó" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, fuzzy, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "%s%d: parseExpressionBoolean ¤¬ %d ¤òÊÖ¤·¤Þ¤·¤¿" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, fuzzy, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "%s:%d: if ¤¬¤Ê¤¤¤Î¤Ë %%else ¤¬¤¢¤ê¤Þ¤¹" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, fuzzy, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "%s:%d: if ¤¬¤Ê¤¤¤Î¤Ë %%endif ¤¬¤¢¤ê¤Þ¤¹" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, fuzzy, c-format msgid "malformed %%include statement\n" msgstr "¤ª¤«¤·¤Ê %%include ¥¹¥Æ¡¼¥È¥á¥ó¥È¤Ç¤¹" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 #, fuzzy msgid "No compatible architectures found for build\n" msgstr "ºîÀ®(build)²Äǽ¤Ê¥¢¡¼¥¥Æ¥¯¥Á¥ã¤Ï¤¢¤ê¤Þ¤»¤ó" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, fuzzy, c-format msgid "Package has no %%description: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï %%description ¤¬¤¢¤ê¤Þ¤»¤ó: %s" @@ -1279,19 +1279,19 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ÎÂоݥ¢¡¼¥¥Æ¥¯¥Á¥ã¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1395,7 +1395,7 @@ msgstr "ÆâÉô¥¨¥é¡¼" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 #, fuzzy msgid " failed - " msgstr "¼ºÇÔ - " @@ -1405,78 +1405,78 @@ msgstr "¼ºÇÔ - " msgid "package %s was already added, replacing with %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:438 +#: lib/depends.c:441 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/depends.c:480 +#: lib/depends.c:483 #, fuzzy msgid "(db provides)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)" @@ -1489,90 +1489,90 @@ msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 #, fuzzy msgid "(not a blob)" msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "PGP ½ð̾¤ò¥¹¥¥Ã¥×¤·¤Þ¤¹" -#: lib/fs.c:74 +#: lib/fs.c:77 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() fugger ¥µ¥¤¥º¤òÊÖ¤¹¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: lib/fs.c:89 +#: lib/fs.c:92 #, fuzzy, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() fugger ¥µ¥¤¥º¤òÊÖ¤¹¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "stat %s ¤Ë¼ºÇÔ: %s" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "¥Õ¥¡¥¤¥ë %4d: %07o %s.%s\t %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, fuzzy, c-format msgid "file %s is on an unknown device\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ÏÉÔÌÀ¤Ê¥Ç¥Ð¥¤¥¹¤Ç¤¹" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%d ¹ÔÌÜ: %s" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Þ¤¹" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s ¤òºï½ü¤Ç¤¤Þ¤»¤ó - ¥Ç¥£¥ì¥¯¥È¥ê¤¬¶õ¤Ç¤¢¤ê¤Þ¤»¤ó" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s ¤Î rmdir ¤Ë¼ºÇÔ: %s" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤¹" @@ -1587,7 +1587,7 @@ msgstr "%s ¤òºîÀ®¤Ç¤¤Þ¤»¤ó: %s\n" msgid "cannot write to %%%s %s\n" msgstr "%s ¤Ø½ñ¤¹þ¤á¤Þ¤»¤ó" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼" @@ -1625,183 +1625,183 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/package.c:778 +#: lib/package.c:786 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: ͸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "ɸ½à½ÐÎϤò <cmd> ¤Ø¥Ñ¥¤¥×¤·¤Þ¤¹" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 #, fuzzy msgid "debug payload file state machine" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 #, fuzzy msgid "debug option/argument processing" msgstr "°ú¿ô½èÍý(%d)¤Ç¤ÎÆâÉô¥¨¥é¡¼ :-(\n" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 #, fuzzy msgid "debug package state machine" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2279,92 +2279,92 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)" msgid "generate signature" msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹" -#: lib/psm.c:270 +#: lib/psm.c:269 #, fuzzy msgid "source package expected, binary found\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lib/psm.c:390 +#: lib/psm.c:394 #, fuzzy msgid "source package contains no .spec file\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "%s ¤ò¥¹¥¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó: %s" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:1522 +#: lib/psm.c:1547 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "¥Õ¥©¡¼¥Þ¥Ã¥ÈÃæ¤Î¥¨¥é¡¼: %s\n" @@ -2414,7 +2414,7 @@ msgid "package has neither file owner or id lists\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êͼԤä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ý¤Ã¤Æ¤¤¤Þ¤»¤ó" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2429,72 +2429,77 @@ msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" msgid "old format source packages cannot be queried\n" msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:515 +#: lib/query.c:517 #, fuzzy msgid "no packages\n" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "ÉÔÌÀ¤Ê¥¿¥°" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "¥°¥ë¡¼¥× %s ¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "%s ¤òÆɤà¤Î¤Ë¼ºÇÔ: $s¡£" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "%s ¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "%s ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â°¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n" -#: lib/query.c:730 +#: lib/query.c:756 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -2519,100 +2524,100 @@ msgstr "%s: fdOpen ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" msgid "makeTempFile failed\n" msgstr "makeTempFile ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, fuzzy, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "°ú¿ô¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: v1.0 ¤Î RPM ¤Ë¤Ï½ð̾¤Ç¤¤Þ¤»¤ó\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ÏºÆ½ð̾¤Ç¤¤Þ¤»¤ó\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: ͸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó(v1.0 RPM)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 #, fuzzy msgid " (MISSING KEYS:" msgstr " (¥¡¼¤Îʶ¼º) " -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr "" -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr " (¿®Íê¤Ç¤¤Ê¤¤¸°:" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr "" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2621,42 +2626,47 @@ msgstr "" "\"B\" ¤Î°Í¸À¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥¥Ã¥×¤·¤Þ¤¹\n" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS ¤Ï½ü³°¤µ¤ì¤Æ¤¤¤Þ¤¹: %s" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" @@ -2710,7 +2720,7 @@ msgstr "%s ¤È¤·¤Æ...\n" msgid "skipping %s - transfer failed - %s\n" msgstr "%s ¤ò¥¹¥¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤»¤ó\n" @@ -2730,51 +2740,51 @@ msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼ " msgid "file %s requires a newer version of RPM\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "°Í¸À¤Î·çÇ¡:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó: %s" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "Æɤ߹þ¤ß¤Î¼ºÇÔ: %s (%d)" @@ -2994,36 +3004,51 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Æɤ߹þ¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó: %s¡£" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "%s %s ¤Ç '('¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "¹ÔÌÜ: %s" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "¥½¡¼¥¹¤Ï: %s\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 #, fuzzy msgid "mounted filesystems:\n" msgstr "¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3160,49 +3185,44 @@ msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" msgid "Header+Payload size: " msgstr "¥Ø¥Ã¥À¥µ¥¤¥º¤¬Â礤¹¤®¤Þ¤¹" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "MD5 ½ð̾¤ò¥¹¥¥Ã¥×¤·¤Þ¤¹" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "½ð̾¥Ñ¥Ã¥É: %d\n" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥¥Ã¥×¤·¤Þ¤¹\n" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" @@ -3215,7 +3235,7 @@ msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3228,7 +3248,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3236,16 +3256,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" @@ -3333,71 +3353,80 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "% ¤Î¸å¤Ë { ¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "%{ ¤Î¸å¤Ë } ¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "¶õ¤Î¥¿¥°¥Õ¥©¡¼¥Þ¥Ã¥È" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "¶õ¤Î¥¿¥°Ì¾" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "ÉÔÌÀ¤Ê¥¿¥°" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "ÇÛÎó¤Î¸å¤Ë ] ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "ͽ´ü¤»¤Ì ]" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "ͽ´ü¤»¤Ì }" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "¼°Ãæ¤Ç ? ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "¼°Ãæ¤Ç ? ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "¼°Ãæ¤Ë } ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "°Ê²¼¤Î ? ¥µ¥Ö¼°¤Î ¤Ë: ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "¼°Ãæ¤Ç : ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "¼°¤Î½ª¤ê¤Ë | ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3421,179 +3450,179 @@ msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤òÌ䤤¹ç¤ï¤»¤Þ¤¹" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó %s:%d" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥¥Ã¥×¤·¤Þ¤¹" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤´¹¤¨¤Þ¤¹" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" @@ -3604,154 +3633,154 @@ msgid "======================== active %d empty %d\n" msgstr "======================== ¥¢¥¯¥Æ¥£¥Ö %d ¥¨¥ó¥×¥Æ¥£ %d\n" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, fuzzy, c-format msgid "Macro %%%s has unterminated body\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï¥Ü¥Ç¥£¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%define)" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, fuzzy, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï opts ¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, fuzzy, c-format msgid "Macro %%%s has empty body\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï¶õ¤Î¥Ü¥Ç¥£¤Ç¤¹" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, fuzzy, c-format msgid "Macro %%%s failed to expand\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï¿Ä¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%undefine)" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, fuzzy, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "¥Þ¥¯¥í %%%s (%s) ¤Ï¥ì¥Ù¥ë %d °Ê²¼¤Ç»ÈÍѤµ¤ì¤Þ¤»¤ó¤Ç¤·¤¿" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c (%s(%s)Ãæ¤Ë)" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, fuzzy, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "ºÆµ¢¤Î¿¼¤µ(%d)¤¬ºÇÂçÃÍ(%d)¤è¤ê¤âÂ礤¤" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤ %c: %s" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, fuzzy, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "A %% ¤Ï¹½Ê¸²òÀϤǤ¤Ê¤¤¥Þ¥¯¥í¤¬Â³¤¤¤Æ¤¤¤Þ¤¹" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "¥Þ¥¯¥í %%%.*s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¡¢¥¹¥¥Ã¥×¤·¤Þ¤¹" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 #, fuzzy msgid "Target buffer overflow\n" msgstr "¥¿¡¼¥²¥Ã¥È¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¡¼¥Õ¥í¡¼" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, fuzzy, c-format msgid "File %s is smaller than %u bytes\n" msgstr "¥Õ¥¡¥¤¥ë %s: ¤Ï %d ¥Ð¥¤¥È¤è¤ê¾®¤µ¤¤¤Ç¤¹" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "À®¸ù" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 #, fuzzy msgid "Bad server response" msgstr "¥µ¡¼¥Ð¤«¤éÀµ¾ï¤Ê±þÅú¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 #, fuzzy msgid "Server I/O error" msgstr "¥µ¡¼¥Ð IO ¥¨¥é¡¼" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 #, fuzzy msgid "Server timeout" msgstr "¥µ¡¼¥Ð¥¿¥¤¥à¥¢¥¦¥È" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 #, fuzzy msgid "Unable to lookup server host address" msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È¥¢¥É¥ì¥¹¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 #, fuzzy msgid "Unable to lookup server host name" msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 #, fuzzy msgid "Failed to connect to server" msgstr "¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 #, fuzzy msgid "Failed to establish data connection to server" msgstr "¥µ¡¼¥Ð¤È¤Î¥Ç¡¼¥¿¥³¥Í¥¯¥·¥ç¥ó¤Î³ÎΩ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 #, fuzzy msgid "I/O error to local file" msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤Î IO ¥¨¥é¡¼" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "¥ê¥â¡¼¥È¥µ¡¼¥Ð¤Î¥Ñ¥Ã¥·¥Ö¥â¡¼¥ÉÀßÄꥨ¥é¡¼" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "¥µ¡¼¥Ð¾å¤Ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "½èÍýÃæ¤Î¥¢¥Ü¡¼¥È" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Unknown or unexpected error" msgstr "ÉÔÌÀ¤â¤·¤¯¤Ïͽ´ü¤»¤Ì¥¨¥é¡¼" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "%s ¤Ø %s pw %s ¤È¤·¤Æ¥í¥°¥¤¥óÃæ\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n" "Language-Team: GNU Translation project <ko@li.org>\n" @@ -109,7 +109,7 @@ msgstr "¸ðµç rpm ¸ðµå¿¡¼ÀÇ ÀϹÝÀûÀÎ ¿É¼Ç:" msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM ¹öÀü - %s\n" @@ -338,27 +338,27 @@ msgstr "°ËÁõ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù" msgid "no arguments given" msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "Àӽà ÆÄÀÏÀ» ¿ ¼ö ¾ø½À´Ï´Ù.\n" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "½ÇÇà Áß(%s): %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "%sÀÇ ½ÇÇà¿¡ ½ÇÆÐÇÔ (%s): %s\n" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "%sÀÇ À߸øµÈ Á¾·á »óȲ (%s)\n" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" @@ -368,244 +368,244 @@ msgstr "" "\n" "RPM Á¦ÀÛ ¿À·ù:\n" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "'==' À» ó¸®(parsing)ÇÏ´Â µµÁß ±¸¹® ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "'&&' À» ó¸®(parsing)ÇÏ´Â µµÁß ±¸¹® ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "'||' À» ó¸®(parsing)ÇÏ´Â µµÁß ±¸¹® ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "Ç¥Çö½Ä¿¡¼ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "'(' °¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù\n" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "'-' ´Â ¼ýÀÚ¿¡¸¸ »ç¿ëÇÕ´Ï´Ù\n" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "'!' ´Â ¼ýÀÚ¿¡¸¸ »ç¿ëÇÕ´Ï´Ù\n" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "À¯ÇüÀº ¹Ýµå½Ã ÀÏÄ¡ÇØ¾ß ÇÕ´Ï´Ù\n" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "'* /' ´Â ¹®ÀÚ¿¿¡¼ »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "'-' ´Â ¹®ÀÚ¿¿¡¼ »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "'&&' ¿Í '||' ´Â ¹®ÀÚ¿¿¡¼ »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "Ç¥Çö½Ä¿¡¼ ±¸¹® ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK ½ÇÆÐ: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "%s %s¿¡ '(' °¡ ¾ø½À´Ï´Ù\n" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "%s(%s¿¡ ')' °¡ ¾ø½À´Ï´Ù\n" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "ºÎÀûÇÕÇÑ %s ÅäÅ«: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, c-format msgid "Missing %s in %s %s\n" msgstr "%2$s %3$s¿¡ %1$s °¡ ¾ø½À´Ï´Ù\n" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "%s() ´ÙÀ½¿¡ °ø¹éÀÌ ¾øÀ½: %s\n" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "À߸øµÈ ±¸¹®: %s(%s)\n" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "À߸øµÈ ¸ðµå spec: %s(%s)\n" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "À߸øµÈ dir¸ðµå spec: %s(%s)\n" -#: build/files.c:793 +#: build/files.c:777 #, fuzzy, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "ºñÁ¤»óÀûÀÎ ·ÎÄÉÀÏ ±æÀÌ: %%lang(%2$s)¿¡ \"%1$.*s\"\n" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, fuzzy, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "%%lang(%2$s)¿¡ Áߺ¹µÈ ·ÎÄÉÀÏ %1$.*s°¡ Á¸ÀçÇÕ´Ï´Ù\n" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "%%docdirÀÇ ÇÑ°è°¡ ÃÊ°úµÇ¾ú½À´Ï´Ù\n" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "%%docdir¿¡ ÇϳªÀÇ Àμö¸¸ ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù\n" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "ÇϳªÀÇ Çà¿¡ µÎ°³ÀÇ ÆÄÀÏÀÌ Á¸ÀçÇÔ: %s\n" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "ÆÄÀÏÀº ¹Ýµå½Ã \"/\" ·Î ½ÃÀÛÇؾßÇÔ: %s\n" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "ƯÁ¤ %%docÀ» ´Ù¸¥ Çü½Ä°ú ÇÔ²² »ç¿ëÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "ÆÄÀÏ ¸ñ·ÏÀÌ Áߺ¹µÊ: %s\n" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "BuildRoot¿¡ ½Éº¼¸¯¸µÅ©ÇÔ: %s -> %s\n" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "ÆÄÀÏÀÌ prefix (%s)¿Í ÀÏÄ¡ÇÏÁö ¾ÊÀ½: %s\n" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "ÆÄÀÏÀº \"/\" ·Î ½ÃÀÛÇؾßÇÔ: %s\n" -#: build/files.c:1839 +#: build/files.c:1828 #, c-format msgid "Glob not permitted: %s\n" msgstr "GlobÀ» »ç¿ëÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "globÀ¸·Î ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%s ÆÄÀÏÀÇ %%files¸¦ ¿ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "Çà: %s\n" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "À߸øµÈ ÆÄÀÏ: %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "À߸øµÈ ¼ÒÀ¯ÀÚ/±×·ì: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "ÆÄÀÏ Ã³¸® Áß: %s-%s-%s\n" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "»ç¿ëÀÚ À̸§ ¼³Á¤[getUname]: uid°¡ ³Ê¹« ¸¹½À´Ï´Ù\n" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "»ç¿ëÀÚ À̸§ ¼³Á¤[getUnameS]: uid°¡ ³Ê¹« ¸¹½À´Ï´Ù\n" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "»ç¿ëÀÚ id ¼³Á¤[getUidS]: uid°¡ ³Ê¹« ¸¹½À´Ï´Ù\n" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "±×·ì À̸§ ¼³Á¤[getGname]: gid°¡ ³Ê¹« ¸¹½À´Ï´Ù\n" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "±×·ì À̸§ ¼³Á¤[getGnameS]: gid°¡ ³Ê¹« ¸¹½À´Ï´Ù\n" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "±×·ì id ¼³Á¤[getGidS]: gid°¡ ³Ê¹« ¸¹½À´Ï´Ù\n" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "È£½ºÆ®¸íÀ» Á¤±ÔÈ(canonicalize) ÇÒ ¼ö ¾øÀ½: %s\n" @@ -715,7 +715,7 @@ msgstr "¼¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n" msgid "Could not open %s: %s\n" msgstr "%s(À»)¸¦ ¿ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" @@ -745,7 +745,7 @@ msgstr "%sÀÇ payload¸¦ ÀÐÀ» ¼ö ¾øÀ½: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "%s¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" @@ -805,17 +805,17 @@ msgstr "%d ¹ø° Çà: %%description¿¡¼ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù: %s\n" msgid "line %d: Bad option %s: %s\n" msgstr "%d ¹ø° Çà: %s(Àº)´Â À߸øµÈ ¿É¼ÇÀÔ´Ï´Ù: %s\n" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "%d ¹ø° Çà: À̸§ÀÌ ³Ê¹« ¸¹½À´Ï´Ù: %s\n" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "%d ¹ø° Çà: ÆÐÅ°Áö°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù: %s\n" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "%d ¹ø° Çà: µÎ¹ø° ³»¿ë(description)\n" @@ -896,7 +896,7 @@ msgstr "%d ¹ø° Çà: űװ¡ ºñ¾îÀÖ½À´Ï´Ù: %s\n" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "%d ¹ø° Çà: %s¿¡ ºÎÀûÇÕÇÑ ¹®ÀÚ '-' °¡ ÀÖÀ½: %s\n" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "BuildRoot¸¦ \"/\" ·Î ÁöÁ¤ÇÒ ¼ö ¾øÀ½: %s\n" @@ -1078,31 +1078,31 @@ msgstr "%s(À»)¸¦ ¿ ¼ö ¾øÀ½: %s\n" msgid "Unclosed %%if\n" msgstr "%%if°¡ ´ÝÈ÷Áö ¾Ê¾Ò½À´Ï´Ù\n" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "%s:%d: parseExpressionBoolean¿¡¼ %d °ªÀÌ ¹ÝȯµÇ¾ú½À´Ï´Ù\n" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "%s:%d: %%else°¡ %%if ¾øÀÌ »ç¿ëµÇ¾ú½À´Ï´Ù\n" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "%s:%d: %%endif°¡ %%if ¾øÀÌ »ç¿ëµÇ¾ú½À´Ï´Ù\n" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "%%include ¹®ÀÌ ¿Ã¹Ù¸£Áö ¾Ê½À´Ï´Ù\n" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 msgid "No compatible architectures found for build\n" msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ȣȯÇÏ´Â ¾ÆÅ°ÅØÃĸ¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "ÆÐÅ°Áö¿¡ %%descriptionÀÌ ¾øÀ½: %s\n" @@ -1228,19 +1228,19 @@ msgstr "ÆÐÅ°Áö Á¦ÀÛ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "(±âÁ¸ÀÇ) rpm[23] ÆÐŰ¡°ú ȣȯÇÏ´Â ÆÐÅ°Áö Çì´õ¸¦ »ý¼ºÇÕ´Ï´Ù" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "ÆÐÅ°ÁöÀÇ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "ÆÐÅ°ÁöÀÇ ¾ÆÅ°ÅØÃĸ¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1337,7 +1337,7 @@ msgstr "³»ºÎ ¿À·ù" msgid "Archive file not in header" msgstr "Çì´õ¿¡ ¾ÆÄ«À̺ê ÆÄÀÏÀÌ ¾ø½À´Ï´Ù" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr " ½ÇÆÐÇÔ - " @@ -1346,52 +1346,52 @@ msgstr " ½ÇÆÐÇÔ - " msgid "package %s was already added, replacing with %s\n" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:438 +#: lib/depends.c:441 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/depends.c:480 +#: lib/depends.c:483 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "´ÙÀ½°ú °ü·ÃµÈ ÆÐÅ°Áö À̸§À» ¹«½ÃÇÕ´Ï´Ù [%d]\t%s -> %s\n" -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼ %s-%s-%s \"%s\"(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1399,27 +1399,27 @@ msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, Æ®¸®, ±íÀÌ" "[depth])\n" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== ÈÄÀÓÀÚ¸¸ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù)" @@ -1431,91 +1431,91 @@ msgstr "(base64°¡ ¾Æ´Õ´Ï´Ù)" msgid "(invalid type)" msgstr "(ºÎÀûÇÕÇÑ Å¸ÀÔ)" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 msgid "(not a blob)" msgstr "(BLOB[Binary Large OBject]ÀÌ ¾Æ´Õ´Ï´Ù)" -#: lib/formats.c:324 +#: lib/formats.c:338 #, fuzzy msgid "(invalid xml type)" msgstr "(ºÎÀûÇÕÇÑ Å¸ÀÔ)" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "¾î¶°ÇÑ PGP ¼¸íµµ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl()¿¡¼ Å©±â¸¦ ¹ÝȯÇϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl()¿¡¼ ¸¶¿îÆ®ÇÒ ÁöÁ¡À» ¹ÝȯÇϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "%sÀÇ »óÅÂ(stat)¸¦ Ç¥½ÃÇϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "%s(À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "ÆÄÀÏ%5d: %07o %s.%s\t %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "%s ÆÄÀÏÀº ¾Ë ¼ö ¾ø´Â ÀåÄ¡ »ó¿¡ ÀÖ½À´Ï´Ù\n" -#: lib/fsm.c:341 +#: lib/fsm.c:350 #, fuzzy -msgid "========== Directories not explictly included in package:\n" +msgid "========== Directories not explicitly included in package:\n" msgstr "========= ÆÐÅ°Áö¿¡ µð·ºÅ丮°¡ Æ÷ÇԵǾî ÀÖÁö ¾ÊÀ½:\n" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%2$04oÀÇ Çã°¡±Ç(perms)À» °¡Áø %1$s µð·ºÅ丮°¡ »ý¼ºµÇ¾ú½À´Ï´Ù.\n" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "Çì´õ ÆÄÀÏ ¸ñ·Ï¿¡¼ ¾ÆÄ«À̺ê ÆÄÀÏ %s(À»)¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "%s(ÀÌ)°¡ %s(À¸)·Î ÀúÀåµÇ¾ú½À´Ï´Ù\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s %s µð·ºÅ丮 »èÁ¦¿¡ ½ÇÆÐÇÔ: ºó µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù\n" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s %s µð·ºÅ丮 »èÁ¦¿¡ ½ÇÆÐÇÔ: %s\n" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s %s ¸µÅ© ÇØÁ¦¿¡ ½ÇÆÐÇÔ: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "%s(ÀÌ)°¡ %s(À¸)·Î »ý¼ºµÇ¾ú½À´Ï´Ù\n" @@ -1530,7 +1530,7 @@ msgstr "%%%s %s(À»)¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" msgid "cannot write to %%%s %s\n" msgstr "%%%s %s(À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "Àӽà ÆÄÀÏ %s(À»)¸¦ »ý¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" @@ -1568,180 +1568,180 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "ÀÌ RPM ¹öÀüÀº ÆÐŰ¡ ¹öÀü '1' À» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "ÀÌ RPM ¹öÀüÀº ÁÖ ¹øÈ£(major number)°¡ <= 4 ÀÎ ÆÐŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: rpmReadSignatureÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: À¯È¿ÇÑ ¼¸íÀÌ ¾ø½À´Ï´Ù\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: FreadÀÌ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "<Ç¥Çö½Ä>+ ÀÇ ¸ÅÅ©·Î È®ÀåÀ» Ãâ·ÂÇÕ´Ï´Ù" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 #, fuzzy msgid "read <FILE:...> instead of default file(s)" msgstr "±âº» ¸ÅÅ©·Î ÆÄÀÏ ´ë½Å <ÆÄÀÏ:..>À» ÀоîµéÀÔ´Ï´Ù" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "libio(3) APIÀÇ »ç¿ëÀ» ÇØÁ¦ÇÕ´Ï´Ù" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "Ç¥ÁØÃâ·ÂÀ» <¸í·É>À¸·Î º¸³À´Ï´Ù" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "<µð·ºÅ丮>¸¦ ÃÖ»óÀ§ µð·ºÅ丮·Î »ç¿ëÇÕ´Ï´Ù" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "ÁúÀÇ Å±׸¦ º¸¿©ÁÝ´Ï´Ù" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "ÇöÀç ¼³Á¤µÇ¾î ÀÖ´Â rpmrcÀÇ ³»¿ë°ú ¸ÅÅ©·Î¸¦ º¸¿©ÁÝ´Ï´Ù" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "ÀÚ¼¼ÇÑ Ãâ·ÂÀ» Á¦°øÇÕ´Ï´Ù" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "¾ÆÁÖ »ó¼¼ÇÑ Ãâ·ÂÀ» Á¦°øÇÕ´Ï´Ù" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "ÇöÀç »ç¿ëµÇ°í ÀÖ´Â rpm ¹öÀüÀ» Ç¥½ÃÇÕ´Ï´Ù" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 #, fuzzy msgid "debug payload file state machine" msgstr "ÄÄÇ»ÅÍÀÇ »óÅÂ(state) ÆÄÀÏÀ» µð¹ö±× ÇÕ´Ï´Ù" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "ÄÄÇ»ÅÍÀÇ »óÅÂ(state) ÆÄÀÏÀ» µð¹ö±× ÇÕ´Ï´Ù" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "µ¥ÀÌÅÍ ½ºÆ®¸² ÇÁ·ÎÅäÄÝÀ» µð¹ö±× ÇÕ´Ï´Ù" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 #, fuzzy msgid "debug option/argument processing" msgstr "Àμö 󸮰úÁ¤ (%d) µµÁß ³»ºÎ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù :-(\n" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 #, fuzzy msgid "debug package state machine" msgstr "ÄÄÇ»ÅÍÀÇ »óÅÂ(state) ÆÄÀÏÀ» µð¹ö±× ÇÕ´Ï´Ù" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "ÄÄÇ»ÅÍÀÇ »óÅÂ(state) ÆÄÀÏÀ» µð¹ö±× ÇÕ´Ï´Ù" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "rpmio ÀÔ/Ãâ·ÂÀ» µð¹ö±× ÇÕ´Ï´Ù" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "URL ij½Ã Çڵ鸵À» µð¹ö±× ÇÕ´Ï´Ù" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2176,93 +2176,93 @@ msgstr "ÆÐÅ°Áö¿¡ ¼¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼¸íÀº »èÁ¦µË´Ï´Ù)" msgid "generate signature" msgstr "¼¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "¼Ò½º ÆÐÅ°Áö°¡ ÇÊ¿äÇϸç, ¹ÙÀ̳ʸ®°¡ °Ë»öµÇ¾ú½À´Ï´Ù\n" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "" "%s: %s ½ºÅ©¸³Æ²¸´(scriptlet)ÀÌ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s(À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" "%2$s-%3$s-%4$sÀÇ %1$s ½ºÅ©¸³Æ²¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, Á¾·á »óȲ %5" "$d\n" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s¿¡ %dÀÇ ÆÄÀÏÀÌ ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" "%s: %s ½ºÅ©¸³Æ²¸´(scriptlet)ÀÌ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s(À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "¼¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏÀÇ " -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s(ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "%s(ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "¿Ã¹Ù¸£Áö ¸øÇÑ Çü½Ä: %s\n" @@ -2311,7 +2311,7 @@ msgid "package has neither file owner or id lists\n" msgstr "ÆÐÅ°Áö¿¡ ÆÄÀÏ ¼ÒÀ¯ÀÚ ¶Ç´Â id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù\n" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2326,71 +2326,76 @@ msgstr "%s(À»)¸¦ ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" msgid "old format source packages cannot be queried\n" msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆÐÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "%s(¿Í)°ú ÀÏÄ¡ÇÏ´Â ÆÐÅ°Áö°¡ ¾øÀ½: %s\n" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "¾Ë ¼ö ¾ø´Â ÅÂ±× ÀÔ´Ï´Ù" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "%s ±×·ìÀº ¾î¶² ÆÐÅ°Áö¿¡µµ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "%s(À»)¸¦ »ý¼ºÇÏ´Â(trigger) ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, c-format msgid "malformed %s: %s\n" msgstr "%s(ÀÌ)°¡ À߸øµÊ: %s\n" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, c-format msgid "no package matches %s: %s\n" msgstr "%s(¿Í)°ú ÀÏÄ¡ÇÏ´Â ÆÐÅ°Áö°¡ ¾øÀ½: %s\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "%s(À»)¸¦ ÇÊ¿ä·Î ÇÏ´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "%s(À»)¸¦ Á¦°øÇÏ´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "%s ÆÄÀÏ: %s\n" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "%s ÆÄÀÏÀº ¾î¶² ÆÐÅ°Áö¿¡µµ µé¾îÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "ºÎÀûÇÕÇÑ ÆÐÅ°Áö ¹øÈ£: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "ÆÐÅ°Áö ±â·Ï(record) ¹øÈ£: %u\n" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "±â·Ï(record) ¹øÈ£ %u(Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö°¡ ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" @@ -2414,99 +2419,99 @@ msgstr "%s: ¿©´Âµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n" msgid "makeTempFile failed\n" msgstr "makeTempFileÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: FwriteÀÌ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "Àμö °ªÀ¸·Î RPM ÆÐÅ°Áö°¡ ÁöÁ¤µÇ¾î¾ß ÇÕ´Ï´Ù\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: v1.0 RPMÀº ¼¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: v2.0 RPMÀº Àç-¼¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignatureÀÌ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: À¯È¿ÇÑ ¼¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "È®ÀÎ" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "¿¹" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2515,42 +2520,47 @@ msgstr "" "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s(À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "========== Àç¹èÄ¡\n" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, c-format msgid "%5d exclude %s\n" msgstr "%5d Á¦¿Ü %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d Àç¹èÄ¡ %s -> %s\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "%s %s(À»)¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "%s(À»)¸¦ %s(À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s µð·ºÅ丮¸¦ %s(À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n" @@ -2604,7 +2614,7 @@ msgstr " ... %s(À¸)·Î\n" msgid "skipping %s - transfer failed - %s\n" msgstr "%s(À»)¸¦ »ý·«ÇÕ´Ï´Ù - Àü¼Û(transfer)¿¡ ½ÇÆÐÇÔ - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "%s(Àº)´Â ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" @@ -2624,51 +2634,51 @@ msgstr "%s ÆÄÀÏÀ» Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" msgid "file %s requires a newer version of RPM\n" msgstr "%s ÆÄÀÏÀº ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%dÀÇ ¼Ò½º¿Í %dÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö°¡ °Ë»öµÇ¾ú½À´Ï´Ù\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s ÆÄÀÏÀ» ¿ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¿©·¯°³ÀÇ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "%s(À»)¸¦ ¿ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "%s(À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "Àдµ¥ ½ÇÆÐÇÔ: %s (%d)\n" @@ -2885,35 +2895,50 @@ msgstr "%s(À»)¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù, HOMEÀÌ ³Ê¹« Å®´Ï´Ù.\n" msgid "Unable to open %s for reading: %s.\n" msgstr "%s(À»)¸¦ ¿ ¼ö ¾øÀ½: %s.\n" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "ºÎÀûÇÕÇÑ ÆÐÅ°Áö ¹øÈ£: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "%s %s¿¡ '(' °¡ ¾ø½À´Ï´Ù\n" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "ºÎÀûÇÕÇÑ ÆÐÅ°Áö ¹øÈ£: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "%sÀÇ rpm µ¥ÀÌÅͺ£À̽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "Çà: %s\n" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "%s(À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3045,49 +3070,44 @@ msgstr "¸ÅÅ©·Î ÆÄÀÏ ¾È¿¡ ¹Ýµå½Ã \"%%_pgp_name\"À» ¼³Á¤ÇØ¾ß ÇÕ´Ï´Ù\n" msgid "Header+Payload size: " msgstr "Çì´õÀÇ Å©±â°¡ ³Ê¹« Å®´Ï´Ù" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "SHA1 Ãà¾à(digest) Çì´õ¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "¾î¶°ÇÑ MD5 ¼¸íµµ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "¼¸íÀÌ ¾ø½À´Ï´Ù\n" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "¼Õ»óµÈ MD5 Ãà¾à(digest): Áö¿øÇÏÁö ¾ÊÀ½\n" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "¼¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s(À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" @@ -3100,7 +3120,7 @@ msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3113,7 +3133,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3121,16 +3141,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "´ÙÀ½À» ãÀ» ¼ö ¾øÀ½ %s" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ý: " @@ -3218,71 +3238,80 @@ msgstr "%s(Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀûÀº Á¤¼ö(long) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" msgid "%s has too large or too small integer value, skipped\n" msgstr "%s(Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀûÀº Á¤¼ö(int) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "'%' µÚ¿¡ '{' °¡ ¾ø½À´Ï´Ù" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "'%{' µÚ¿¡ '}' °¡ ¾ø½À´Ï´Ù" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "ÅÂ±× Çü½ÄÀÌ ºñ¾îÀÖ½À´Ï´Ù" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "ÅÂ±× À̸§ÀÌ ºñ¾îÀÖ½À´Ï´Ù" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "¾Ë ¼ö ¾ø´Â ÅÂ±× ÀÔ´Ï´Ù" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "¹è¿ÀÇ ³¡ºÎºÐ¿¡ ']' °¡ ¿Í¾ßÇÕ´Ï´Ù" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "ºÒÇÊ¿äÇÑ ']' °¡ ÀÖ½À´Ï´Ù" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "ºÒÇÊ¿äÇÑ '}' °¡ ÀÖ½À´Ï´Ù" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "Ç¥Çö½Ä¿¡ '?' °¡ ¿Í¾ßÇÕ´Ï´Ù" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "Ç¥Çö½ÄÀÇ '?' µÚ¿¡ '{' °¡ ¿Í¾ßÇÕ´Ï´Ù" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "Ç¥Çö½Ä¿¡ '}' °¡ ¿Í¾ßÇÕ´Ï´Ù" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "'?' ÇϺÎÇ¥Çö½Ä(subexpression) µÚ¿¡ ':' ÀÌ ¿Í¾ßÇÕ´Ï´Ù" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "Ç¥Çö½ÄÀÇ ':' µÚ¿¡ '{' °¡ ¿Í¾ßÇÕ´Ï´Ù" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "Ç¥Çö½ÄÀÇ ³¡ºÎºÐ¿¡ '|' °¡ ¿Í¾ßÇÕ´Ï´Ù" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3306,183 +3335,183 @@ msgstr "µ¥ÀÌÅͺ£À̽º ÆÄÀÏÀ» °Ë»çÇÕ´Ï´Ù" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "(±âÁ¸ÀÇ) rpm[23] ÆÐŰ¡°ú ȣȯÇÏ´Â Çì´õ¸¦ »ý¼ºÇÕ´Ï´Ù" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" "DB ÅÂ±× ÃʱâÈ[dbiTagsInit]: ÀÎÁõµÇÁö ¾ÊÀº ÅÂ±× À̸§: \"%s\"(Àº)´Â ¹«½ÃµË´Ï" "´Ù\n" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "db%2$d(À»)¸¦ ÀÌ¿ëÇÏ¿© %1$s À妽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù - %3$s (%4$d)\n" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, c-format msgid "cannot open %s index\n" msgstr "%s À妽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" "%3$s À妽º¿¡¼ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, fuzzy, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u(ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%xÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" "%3$s À妽º¿¡¼ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "%2$s À妽º¿¡¼ \"%1$s\"(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%2$s À妽º¿¡¼ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" "%3$s À妽º¿¡¼ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "%3$s¿¡¼ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 #, fuzzy msgid "rpmdbAdd: skipping" msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u(ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%2$s À妽º¿¡ \"%1$s\"(À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "db3¸¦ À籸ÃàÇÑ ÈÄ¿¡ %s(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%2$s¿¡ %1$s µ¥ÀÌÅͺ£À̽º¸¦ À籸Ãà ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s(ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "dbapi %d·Î ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "dbapi %d·Î »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u(ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "%u¿¡ óÀ½ºÎÅÍ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "º¹±¸Çϱâ À§ÇØ %2$sÀÇ ÆÄÀÏÀ» %1$sÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" @@ -3493,145 +3522,145 @@ msgid "======================== active %d empty %d\n" msgstr "======================== %d È°¼º %d ºñ¾îÀÖÀ½\n" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(ºñ¾îÀÖÀ½)" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(ºñ¾îÀÖÀ½)\n" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "¸ÅÅ©·Î %%%s¿¡ Á¾·áµÇÁö ¾ÊÀº ³»¿ë(body)ÀÌ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "¸ÅÅ©·Î %%%s¿¡ ºÎÀûÇÕÇÑ À̸§ÀÌ ÀÖ½À´Ï´Ù (%%define)\n" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "¸ÅÅ©·Î %%%s¿¡ Á¾·áµÇÁö ¾ÊÀº ¿É¼ÇÀÌ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "¸ÅÅ©·Î %%%s¿¡ ºñ¾îÀÖ´Â ³»¿ë(body)ÀÌ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "¸ÅÅ©·Î %%%s(À»)¸¦ È®Àå(expand)Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "¸ÅÅ©·Î %%%s¿¡ ºÎÀûÇÕÇÑ À̸§ÀÌ ÀÖ½À´Ï´Ù (%%undefine)\n" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "¸ÅÅ©·Î %%%s (%s)´Â ·¹º§ %d ÀÌÇÏ¿¡¼´Â »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "%2$s(%3$s)¿¡ ¾Ë ¼ö ¾ø´Â ¿É¼Ç %1$c(ÀÌ)°¡ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "¹Ýº¹ Ƚ¼ö(%d)°¡ ÃÖ´ëÄ¡(%d) º¸´Ù Å®´Ï´Ù\n" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c(ÀÌ)°¡ Á¾·áµÇÁö ¾ÊÀ½: %s\n" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "'%%' ´ÙÀ½¿¡ ó¸®ÇÒ ¼ö ¾ø´Â(unparseable) ¸ÅÅ©·Î°¡ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "¸ÅÅ©·Î %%%.*s¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "¸ñÇ¥´ë»ó(Target) ¹öÆÛ ¿À¹öÇ÷οì\n" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "%s ÆÄÀÏ: %s\n" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "%s ÆÄÀÏÀÌ %u ¹ÙÀÌÆ® º¸´Ù Àû½À´Ï´Ù\n" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "¼º°ø" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "À߸øµÈ ¼¹ö ÀÀ´äÀÔ´Ï´Ù" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "¼¹ö ÀÔ/Ãâ·Â ¿À·ùÀÔ´Ï´Ù" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "¼¹ö ´ë±â½Ã°£ÀÌ ÃÊ°úµÇ¾ú½À´Ï´Ù" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "¼¹ö È£½ºÆ® ÁÖ¼Ò¸¦ °Ë»öÇÒ ¼ö ¾ø½À´Ï´Ù" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "¼¹ö È£½ºÆ® À̸§À» °Ë»öÇÒ ¼ö ¾ø½À´Ï´Ù" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "¼¹ö¿¡ Á¢¼ÓÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "¼¹ö¿¡ µ¥ÀÌÅÍ Á¢¼ÓÀ» ½ÃµµÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "·ÎÄà ÆÄÀÏ¿¡ ÀÔ/Ãâ·Â ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "" "¿ø°Ý ¼¹ö¸¦ ¼öµ¿ ¸ðµå(passive mode)·Î ¼³Á¤ÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "¼¹ö¿¡¼ ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "ÁøÇàÀÌ ÁߴܵǾú½À´Ï´Ù" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "¾Ë ¼ö ¾ø´Â ȤÀº ¿¹»óÄ¡ ¸øÇÑ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "%s¿¡ %s(À¸)·Î ±â·Ï(logging)ÇÕ´Ï´Ù, pw %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -108,7 +108,7 @@ msgstr "" msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM versjon %s\n" @@ -338,27 +338,27 @@ msgstr "ingen argumenter oppgitt for verifisering" msgid "no arguments given" msgstr "ingen argumenter oppgitt for spørring" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "Kjører(%s): %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "Kjøring av %s feilet (%s): %s\n" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "Ugyldig sluttstatus fra %s (%s)\n" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" @@ -368,244 +368,244 @@ msgstr "" "\n" "RPM-feil under bygging:\n" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "syntaksfeil under lesing av ==\n" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "syntaksfeil under lesing av &&\n" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "syntaksfeil under lesing av ||\n" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "feil under lesing av uttrykk\n" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "ubalansert (\n" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "- kun på tall\n" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "! kun på tall\n" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "typene må være like\n" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "* / ikke støttet for strenger\n" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "- ikke støttet for strenger\n" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "&& og || ikke støttet for strenger\n" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "syntaksfeil i uttrykk\n" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIDSJEKK feil: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "Mangler '(' i %s %s\n" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "Mangler ')' i %s(%s\n" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "Ugyldig %s-tegn: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "Mangler '(' i %s %s\n" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "To filer på én linje: %s\n" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "Filen må begynne med \"/\": %s\n" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Kan ikke blande spesiell %%doc med andre skjema: %s\n" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "Fil listet to ganger: %s\n" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolsk lenke peker til BuildRoot: %s -> %s\n" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "Fil ikke funnet: %s\n" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: readLead feilet\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1839 +#: build/files.c:1828 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linje %d: Filnavn ikke tillatt: %s\n" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "Installerer %s\n" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ugyldig fil %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Ugyldig eier/gruppe: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "ingen pakke utløser %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "" @@ -719,7 +719,7 @@ msgstr "Kunne ikke åpne spec fil %s: %s\n" msgid "Could not open %s: %s\n" msgstr "Kunne ikke åpne %s: %s\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -749,7 +749,7 @@ msgstr "Kunne ikke lese \"payload\" fra %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive \"payload\" til %s: %s\n" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -809,17 +809,17 @@ msgstr "" msgid "line %d: Bad option %s: %s\n" msgstr "linje %d: Ugyldig flagg %s: %s\n" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "" @@ -900,7 +900,7 @@ msgstr "linje %d: Tom tagg: %s\n" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "linje %d: Ugyldig tegn '-' i %s: %s\n" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "BuildRoot kan ikke være \"/\": %s\n" @@ -1082,31 +1082,31 @@ msgstr "Kan ikke åpne %s: %s\n" msgid "Unclosed %%if\n" msgstr "Åpen %%if\n" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "%s:%d: parseExpressionBoolean returnerer %d\n" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "%s:%d: %%else uten %%if\n" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "%s:%d: %%endif uten %%if\n" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "ugyldig %%include utsagn\n" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 msgid "No compatible architectures found for build\n" msgstr "Ingen kompatible arkitekturer funnet for bygging\n" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "Pakken har ingen %%description: %s\n" @@ -1234,19 +1234,19 @@ msgstr "ikke verifiser pakkeavhengigheter" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "ikke verifiser pakkeavhengigheter" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "ikke verifiser pakkearkitektur" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1342,7 +1342,7 @@ msgstr "Intern feil" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr " feilet - " @@ -1351,74 +1351,74 @@ msgstr " feilet - " msgid "package %s was already added, replacing with %s\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:438 +#: lib/depends.c:441 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:467 +#: lib/depends.c:470 msgid "(db files)" msgstr "" -#: lib/depends.c:480 +#: lib/depends.c:483 msgid "(db provides)" msgstr "" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "" @@ -1430,89 +1430,89 @@ msgstr "" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 msgid "(not a blob)" msgstr "" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "hopp over PGP-signaturer" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() feilet å returnere størrelse: %s\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "feil under kjøring av stat på %s: %s\n" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "Fil %s: %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "fil %s er på en ukjent enhet\n" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "%s lagret som %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir av %s feilet: Katalogen er ikke tom\n" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir av %s feilet: %s\n" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink av %s feilet: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "%s opprettet som %s\n" @@ -1527,7 +1527,7 @@ msgstr "kan ikke opprette %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "kan ikke skrive til %%%s %s\n" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "feil under oppretting av midlertidig fil %s\n" @@ -1565,176 +1565,176 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: rpmReadSignature feilet\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen signatur tilgjengelig\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: readLead feilet\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread feilet: %s\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "skriv ut makroutvidelsen av <uttr>+" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 #, fuzzy msgid "read <FILE:...> instead of default file(s)" msgstr "les <fil:...> i stedet for standard makrofil(er)" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "slå av bruk av libio(3) API" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "send stdout til <kmd>" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "bruk <katalog> som toppnivåkatalog" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "vis kjente tagger for spørring" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "vis endelig rpmrc og makrokonfigurasjon" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "gi mindre detaljert info" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "gi mer detaljert info" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "skriv ut hvilken versjon av rpm som brukes" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 msgid "use threads for file state machine" msgstr "" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "feilsøking på protokoll-datastrøm" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 #, fuzzy msgid "debug option/argument processing" msgstr "Intern feil i argumentprosesseringen (%d) :-(\n" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 msgid "debug package state machine" msgstr "" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 msgid "use threads for package state machine" msgstr "" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "feilsøk rpmio I/U" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "feilsøk URL-cache håndtering" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2166,89 +2166,89 @@ msgstr "signer en pakke (forkast nåværende signatur)" msgid "generate signature" msgstr "generer signatur" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "" -#: lib/psm.c:747 +#: lib/psm.c:762 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr "" -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "ukorrekt format: %s\n" @@ -2297,7 +2297,7 @@ msgid "package has neither file owner or id lists\n" msgstr "pakken har verken fileier eller id-lister\n" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2312,71 +2312,76 @@ msgstr "spørring på %s feilet\n" msgid "old format source packages cannot be queried\n" msgstr "kildepakker i gammelt format kan ikke spørres\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "ingen pakke utløser %s\n" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "ingen pakker\n" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "linje %d: Ukjent tagg: %s\n" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "gruppe %s inneholder ingen pakker\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "ingen pakke utløser %s\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "kunne ikke opprette %s: %s\n" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "ingen pakke utløser %s\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "ingen pakke krever %s\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "ingen pakke gir %s\n" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "fil %s: %s\n" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "filen %s eies ikke av noen pakke\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "ugyldig pakkenummer: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" @@ -2398,141 +2403,146 @@ msgstr "%s: åpne feilet: %s\n" msgid "makeTempFile failed\n" msgstr "makeTempFile feilet\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite feilet: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "argumentet er ikke en RPM-pakke\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: kan ikke signere v1.0 RPM\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Kan ikke signere v2.0 RPM på nytt\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead feilet: %s\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature feilet: %s\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead feilet\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead feilet\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead feilet\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead feilet\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "IKKE OK" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr "" -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr "" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "OK" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "NEI" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "JA" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "eksluderer %s %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omplasser %s -> %s\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "eksluderer %s %s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "relokerer %s til %s\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "relokerer katalog %s til %s\n" @@ -2586,7 +2596,7 @@ msgstr " ... som %s\n" msgid "skipping %s - transfer failed - %s\n" msgstr "hopper over %s - overføring feilet - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2606,51 +2616,51 @@ msgstr "feil under lesing fra fil %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "fil %s trenger en nyere versjon av RPM\n" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "feilede avhengigheter:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke åpne %s: %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "lesing feilet: %s (%d)\n" @@ -2861,36 +2871,51 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "ugyldig pakkenummer: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "Mangler '(' i %s %s\n" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "ugyldig pakkenummer: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "kan ikke åpne database i %s\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "Installerer %s\n" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "Henter %s\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 #, fuzzy msgid "mounted filesystems:\n" msgstr "henter liste over monterte filsystemer\n" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3022,48 +3047,43 @@ msgstr "" msgid "Header+Payload size: " msgstr "For stor header" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "ikke verifiser header SHA1 digest" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "hopp over MD5-signaturer" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" @@ -3076,7 +3096,7 @@ msgstr "ekskluderer katalog %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3089,7 +3109,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3097,16 +3117,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "mangler %s" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "feilede avhengigheter:\n" @@ -3194,71 +3214,80 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "mangler { etter %" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "mangler } etter %{" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3280,176 +3309,176 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kan ikke åpne %s-indeks ved bruk av db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, c-format msgid "cannot open %s index\n" msgstr "kan ikke åpne %s indeks\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "feil(%d) under fjerning av post %s fra %s\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "feil(%d) under fjerning av post %s fra %s\n" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -3460,144 +3489,144 @@ msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "Overflyt i målbuffer\n" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "Fil %s: %s\n" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Fil %s er mindre enn %u bytes\n" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.3-20030515\n" -"POT-Creation-Date: 2003-05-15 18:53+0200\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2003-06-08 22:42+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -1423,7 +1423,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "rpmtsOrder nie powiod³o siê, zosta³o %d elementów\n" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 -#: rpmdb/header.c:3533 rpmdb/header.c:3562 rpmdb/header.c:3586 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(nie jest liczb±)" @@ -1478,7 +1478,8 @@ msgid "file %s is on an unknown device\n" msgstr "plik %s jest na nieznanym urz±dzeniu\n" #: lib/fsm.c:350 -msgid "========== Directories not explictly included in package:\n" +#, fuzzy +msgid "========== Directories not explicitly included in package:\n" msgstr "========== Katalogi nie w³±czone explicite do pakietu:\n" #: lib/fsm.c:352 @@ -2233,7 +2234,7 @@ msgstr "%s nie powiód³ siê na pliku %s: %s\n" msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê: %s\n" -#: lib/query.c:118 lib/rpmts.c:460 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "b³êdny format: %s\n" @@ -2281,7 +2282,7 @@ msgid "package has neither file owner or id lists\n" msgstr "pakiet nie ma list w³a¶cicieli ani id plików\n" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1015 lib/rpmts.c:471 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2365,7 +2366,7 @@ msgstr "numer rekordu pakietu: %u\n" msgid "record %u could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %u\n" -#: lib/query.c:766 lib/rpminstall.c:779 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -2499,31 +2500,36 @@ msgstr " %s A %s\tB %s\n" msgid "package %s has unsatisfied %s: %s\n" msgstr "pakiet %s ma niespe³nione %s: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "%s pominiêty z powodu flagi missingok\n" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "========== przesuniêcia\n" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, c-format msgid "%5d exclude %s\n" msgstr "%5d wy³±czenie %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d przesuniêcie %s -> %s\n" -#: lib/rpmfi.c:794 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "wy³±czanie %s %s\n" -#: lib/rpmfi.c:804 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/rpmfi.c:891 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "przesuwanie katalogu %s do %s\n" @@ -2574,7 +2580,7 @@ msgstr "... jako %s\n" msgid "skipping %s - transfer failed - %s\n" msgstr "%s pomijany - transmisja %s nie powiod³a siê\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:869 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie mo¿e byæ zainstalowany\n" @@ -2599,7 +2605,7 @@ msgstr "plik %s wymaga nowszej wersji RPM-a\n" msgid "found %d source and %d binary packages\n" msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n" -#: lib/rpminstall.c:637 lib/rpminstall.c:807 lib/rpminstall.c:1236 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 msgid "Failed dependencies:\n" msgstr "Niespe³nione zale¿no¶ci:\n" @@ -2617,22 +2623,22 @@ msgstr "instalacja pakietów binarnych\n" msgid "cannot open file %s: %s\n" msgstr "nie mo¿na otworzyæ pliku %s: %s\n" -#: lib/rpminstall.c:782 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" okre¶la wiele pakietów\n" -#: lib/rpminstall.c:853 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s\n" -#: lib/rpminstall.c:859 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" -#: lib/rpminstall.c:1230 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "Cofniêcie pakietów (+%d/-%d) do %-24.24s (0x%08x):\n" @@ -2854,30 +2860,45 @@ msgstr "Nie mo¿na otworzyæ %s do odczytu: %s.\n" msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ bazy danych Packages w %s\n" -#: lib/rpmts.c:350 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "b³êdny numer pakietu: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "Brak '(' w %s %s\n" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "b³êdny numer pakietu: %s\n" + +#: lib/rpmts.c:448 #, c-format msgid "cannot open Solve database in %s\n" msgstr "nie mo¿na otworzyæ bazy danych Solve w %s\n" -#: lib/rpmts.c:492 +#: lib/rpmts.c:590 #, c-format msgid "Adding: %s\n" msgstr "Dodawane: %s\n" -#: lib/rpmts.c:504 +#: lib/rpmts.c:602 #, c-format msgid "Suggesting: %s\n" msgstr "Sugerowane: %s\n" -#: lib/rpmts.c:972 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "podmontowane systemy plików:\n" -#: lib/rpmts.c:974 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr " i urz bloków bl.wolnych i.wolnych punkt montowania\n" -#: lib/rpmts.c:1030 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "%5d 0x%04x %5u %12ld %12ld %s\n" @@ -3041,13 +3062,8 @@ msgstr "Uszkodzony skrót MD5: NIE OBS£UGIWANY\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "Sygnatura: NIEZNANA (%d)\n" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "%s pominiêty z powodu flagi missingok\n" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "wy³±czanie katalogu %s\n" @@ -3060,7 +3076,7 @@ msgstr "wy³±czanie katalogu %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1067 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "sprawdzanie poprawno¶ci %d elementów\n" @@ -3073,7 +3089,7 @@ msgstr "sprawdzanie poprawno¶ci %d elementów\n" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1155 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "obliczanie %d odcisków plików\n" @@ -3081,7 +3097,7 @@ msgstr "obliczanie %d odcisków plików\n" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1236 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "obliczanie dyspozycji plików\n" @@ -3133,7 +3149,9 @@ msgstr "sprawdzono indeks db %s/%s\n" #: rpmdb/db3.c:986 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" -msgstr "znaleziono wy³±czne muteksy posix(%d), dodanie DB_PRIVATE, u¿ycie blokady fcntl\n" +msgstr "" +"znaleziono wy³±czne muteksy posix(%d), dodanie DB_PRIVATE, u¿ycie blokady " +"fcntl\n" #: rpmdb/db3.c:1090 #, c-format @@ -3178,77 +3196,77 @@ msgstr "%s ma zbyt du¿± lub zbyt ma³± warto¶æ long, pominiêto\n" msgid "%s has too large or too small integer value, skipped\n" msgstr "%s ma zbyt du¿± lub zbyt ma³± warto¶æ ca³kowit±, pominiêto\n" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "brak { po %" -#: rpmdb/header.c:2739 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "brak } po %{" -#: rpmdb/header.c:2755 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "pusty format etykiety" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "pusta nazwa etykiety" -#: rpmdb/header.c:2776 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "nieznana etykieta" -#: rpmdb/header.c:2803 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "spodziewany ] na koñcu tablicy" -#: rpmdb/header.c:2816 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "nie spodziewany ]" -#: rpmdb/header.c:2829 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "nie spodziewany }" -#: rpmdb/header.c:2893 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "spodziewany ? w wyra¿eniu" -#: rpmdb/header.c:2900 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "spodziewany { po ? w wyra¿eniu" -#: rpmdb/header.c:2912 rpmdb/header.c:2952 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "spodziewany } w wyra¿eniu" -#: rpmdb/header.c:2920 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "spodziewany : po podwyra¿eniu ?" -#: rpmdb/header.c:2938 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "spodziewany { po : w wyra¿eniu" -#: rpmdb/header.c:2960 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "spodziewany | na koñcu wyra¿enia" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3061 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "(indeks spoza zakresu)" -#: rpmdb/header.c:3308 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "iterator tablicy u¿yty na tablicach o ró¿nych rozmiarach" -#: rpmdb/header.c:3624 +#: rpmdb/header.c:3600 #, c-format msgid "%c" msgstr "%c" -#: rpmdb/header.c:3640 +#: rpmdb/header.c:3616 msgid "%a %b %d %Y" msgstr "%a %d %b %Y" @@ -3425,25 +3443,25 @@ msgstr "nag³ówek #%u w bazie danych jest b³êdny -- pominiêto.\n" msgid "cannot add record originally at %u\n" msgstr "nie mo¿na dodaæ rekordu bêd±cego oryginalnie przy %u\n" -#: rpmdb/rpmdb.c:3770 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n" -#: rpmdb/rpmdb.c:3778 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: rpmdb/rpmdb.c:3780 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "aby odzyskaæ, nale¿y zast±piæ pliki w %s plikami z %s" -#: rpmdb/rpmdb.c:3790 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "usuwanie katalogu %s\n" -#: rpmdb/rpmdb.c:3792 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" @@ -3804,8 +3822,8 @@ msgid "DIRECTORY" msgstr "KATALOG" # --- from popt/po/pl.po (in popt.h, not in .pot) --- -msgid "Options implemented via popt alias/exec:" -msgstr "Opcje zaimplementowane poprzez popt alias/exec:" +#~ msgid "Options implemented via popt alias/exec:" +#~ msgstr "Opcje zaimplementowane poprzez popt alias/exec:" -msgid "Help options:" -msgstr "Opcje pomocy:" +#~ msgid "Help options:" +#~ msgstr "Opcje pomocy:" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n" "Language-Team: pt <morais@kde.org\n" @@ -108,7 +108,7 @@ msgstr "Opções comuns para todos os modos do rpm:" msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM versão %s\n" @@ -346,27 +346,27 @@ msgstr "não foram indicados argumentos para a verificação" msgid "no arguments given" msgstr "não foram indicados argumentos para a pesquisa" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "Não consegui abrir um ficheiro temporário.\n" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "A executar(%s): %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "A execução de %s falhou (%s): %s\n" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "Código de saída inválido do %s (%s)\n" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" @@ -376,244 +376,244 @@ msgstr "" "\n" "Erros de criação do RPM:\n" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "erro de sintaxe ao analisar o ==\n" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "erro de sintaxe ao analisar o &&\n" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "erro de sintaxe ao analisar o ||\n" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "erro de análise na expressão\n" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "( não correspondido\n" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "- só em números\n" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "! só em números\n" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "os tipos têm de corresponder\n" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "* / não suportados em cadeias de caracteres\n" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "- não suportado em cadeias de caracteres\n" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "&& e || não suportados em cadeias de caracteres\n" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "erro de sintaxe na expressão\n" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "Falha no TIMECHECK: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "Falta um '(' em %s %s\n" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "Falta um ')' em %s(%s\n" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "Elemento %s inválido: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, c-format msgid "Missing %s in %s %s\n" msgstr "Falta um %s em %s %s\n" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "Carácter sem ser espaço a seguir a %s(): %s\n" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Sintaxe inválida: %s(%s)\n" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Spec de modo inválido: %s(%s)\n" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Spec de dirmode inválido: %s(%s)\n" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Tamanho anormal do locale: \"%.*s\" no %%lang(%s)\n" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Locale %.*s duplicado no %%lang(%s)\n" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "Limite atingido para o %%docdir\n" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "Só um argumento no %%docdir\n" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "Dois ficheiros na mesma linha: %s\n" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "O ficheiro tem de começar por \"/\": %s\n" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Não é possível misturar o %%doc especial com outras formas: %s\n" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "Ficheiro listado duas vezes: %s\n" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "A 'symlink' aponta para a BuildRoot: %s -> %s\n" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "O ficheiro não corresponde ao prefixo (%s): %s\n" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "Ficheiro não encontrado: %s\n" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr ":%s: o readLead falhou\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "O ficheiro precisa de começar por \"/\": %s\n" -#: build/files.c:1839 +#: build/files.c:1828 #, c-format msgid "Glob not permitted: %s\n" msgstr "Glob não permitido: %s\n" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "Ficheiro não encontrado pelo glob: %s\n" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Não consegui abrir o ficheiro do %%files %s: %s\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "linha: %s\n" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ficheiro inválido: %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Dono/grupo inválido: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "A processar os ficheiros: %s-%s-%s\n" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "getUname: demasiados uid's\n" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "getUnameS: demasiados uid's\n" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "getUidS: demasiados uid's\n" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "getGname: demasiados gid's\n" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "getGnameS: demasiados gid's\n" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "getGidS: demasiados gid's\n" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "Não consegui canonizar o nome da máquina: %s\n" @@ -725,7 +725,7 @@ msgstr "Não consegui reler o cabeçalho do assinatura.\n" msgid "Could not open %s: %s\n" msgstr "Não consigo aceder ao %s: %s\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "Não consegui gravar o pacote: %s\n" @@ -755,7 +755,7 @@ msgstr "Não consegui ler o conteúdo de %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Não consegui escrever o conteúdo de %s: %s\n" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" @@ -815,17 +815,17 @@ msgstr "linha %d: Erro ao analisar a %%description: %s\n" msgid "line %d: Bad option %s: %s\n" msgstr "linha %d: Opção inválida %s: %s\n" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "linha %d: Demasiados nomes: %s\n" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "linha %d: O pacote não existe: %s\n" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "linha %d: Segunda descrição\n" @@ -906,7 +906,7 @@ msgstr "linha %d: Opção em branco: %s\n" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "linha %d: Carácter '-' ilegal no %s: %s\n" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "O BuildRoot não pode ser o \"/\": %s\n" @@ -1088,31 +1088,31 @@ msgstr "Incapaz de aceder ao %s: %s\n" msgid "Unclosed %%if\n" msgstr "%%if não fechado\n" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "%s:%d: o parseExpressionBoolean devolve %d\n" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "%s:%d: Descobri um %%else sem um %%if\n" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "%s:%d: Descobri um %%endif sem um %%if\n" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "instrução %%include desorganizada\n" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 msgid "No compatible architectures found for build\n" msgstr "Não foram encontradas arquitecturas compatíveis para as quais criar\n" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "O pacote não tem uma %%description: %s\n" @@ -1244,19 +1244,19 @@ msgstr "não verificar as dependências de compilação" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "gerar um cabeçalho do pacote compatível com os pacotes do rpm[23]" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "não verificar as dependências do pacote" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "não verifica a arquitectura do pacote" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1352,7 +1352,7 @@ msgstr "Erro interno" msgid "Archive file not in header" msgstr "Ficheiro de arquivo não está no cabeçalho" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr " falhou - " @@ -1361,79 +1361,79 @@ msgstr " falhou - " msgid "package %s was already added, replacing with %s\n" msgstr "o pacote %s já está instalado" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n" -#: lib/depends.c:438 +#: lib/depends.c:441 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n" -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "ficheiro db inválido %s\n" -#: lib/depends.c:480 +#: lib/depends.c:483 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "nenhum pacote\n" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "ignorar relações entre o nome do pacote [%d]\t%s -> %s\n" -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" "========== ordenar pacotes (order, #predecessors, #succesors, tree, depth)\n" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(não é um número)" @@ -1445,93 +1445,93 @@ msgstr "(não é um base64)" msgid "(invalid type)" msgstr "(tipo inválido)" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 msgid "(not a blob)" msgstr "(não é um blob)" -#: lib/formats.c:324 +#: lib/formats.c:338 #, fuzzy msgid "(invalid xml type)" msgstr "(tipo inválido)" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "ignorar as assinaturas de PGP" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "o mntctl() falhou ao devolver o tamanho: %s\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "o mntctl() falhou ao devolver o número de pontos de montagem: %s\n" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "Não consegui analisar o %s: %s\n" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "falhei ao aceder ao %s: %s\n" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "Ficheiro%5d: %07o %s.%s\t %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "o ficheiro %s está num dispositivo desconhecido\n" -#: lib/fsm.c:341 +#: lib/fsm.c:350 #, fuzzy -msgid "========== Directories not explictly included in package:\n" +msgid "========== Directories not explicitly included in package:\n" msgstr "========= Directorias não incluidas explicitamente no pacote:\n" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "directoria %s criada com as permissões %04o.\n" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" "o ficheiro de arquivo %s não foi encontrado na lista de ficheiros do " "cabeçalho\n" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "%s gravado como %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir de %s falhou: Directoria não está vazia\n" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir de %s falhou: %s\n" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink de %s falhou: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "%s criado como %s\n" @@ -1546,7 +1546,7 @@ msgstr "não consigo criar o %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "não consigo escrever em %%%s %s\n" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "erro ao criar o ficheiro temporário %s\n" @@ -1584,180 +1584,180 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "a versão 1 dos pacotes não é suportada por esta versão do RPM\n" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "só os pacotes com versão <= 4 são suportados por esta versão do RPM\n" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: o rpmReadSignature falhou\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: Nenhuma assinatura disponível\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr ":%s: o readLead falhou\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: O fread falhou: %s\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "imprimir a expansão da macro <expr>+" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 #, fuzzy msgid "read <FILE:...> instead of default file(s)" msgstr "ler o <fich:...> em vez do(s) ficheiro(s) de macros por omissão" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "desactivar o uso da API da libio(3)" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "manda o stdout para <cmd>" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "usa <dir> como a directoria de topo" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "mostrar as opções de pesquisa conhecidas" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "mostra a configuração final do rpmrc e das macros" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "devolver um resultado menos detalhado" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "devolver um resultado mais detalhado" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "imprime a versão do RPM que está a usar" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 #, fuzzy msgid "debug payload file state machine" msgstr "depurar máquina de estados de ficheiros" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "depurar máquina de estados de ficheiros" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "depurar a sequência de dados do protocolo" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 #, fuzzy msgid "debug option/argument processing" msgstr "Erro interno no processamento de argumentos (%d) :-(\n" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 #, fuzzy msgid "debug package state machine" msgstr "depurar máquina de estados de ficheiros" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "depurar máquina de estados de ficheiros" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "depurar a E/S da rpmio" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "depurar a gestão da 'cache' de URLs" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2189,91 +2189,91 @@ msgstr "assinar um pacote (retira a assinatura actual)" msgid "generate signature" msgstr "gerar a assinatura" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "" "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "o pacote de código-fonte não contem um ficheiro .spec\n" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s tem %d ficheiros, teste = %d\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Não consegui reler o cabeçalho do assinatura.\n" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "o utilizador %s não existe - a usar o root\n" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "o grupo %s não existe - a usar o root\n" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s falhou no ficheiro %s: %s\n" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "%s falhou: %s\n" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "formato incorrecto: %s\n" @@ -2322,7 +2322,7 @@ msgid "package has neither file owner or id lists\n" msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2338,71 +2338,76 @@ msgid "old format source packages cannot be queried\n" msgstr "" "os pacotes com código-fonte no formato antigo não podem ser pesquisados\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "nenhum pacote coincide com %s: %s\n" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "nenhum pacote\n" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "opção desconhecida" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "o grupo %s não contém nenhum pacote\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "nenhum pacote activa o %s\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, c-format msgid "malformed %s: %s\n" msgstr "malformado %s: %s\n" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, c-format msgid "no package matches %s: %s\n" msgstr "nenhum pacote coincide com %s: %s\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "nenhum pacote precisa do %s\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "nenhum pacote oferece o %s\n" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "ficheiro %s: %s\n" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "o ficheiro %s não pertence a nenhum pacote\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "número de pacote inválido: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "número de registo do pacote: %u\n" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "o registo %u não pôde ser lido\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "o pacote %s não está instalado\n" @@ -2426,99 +2431,99 @@ msgstr "%s: o acesso falhou: %s\n" msgid "makeTempFile failed\n" msgstr "o makeTempFile falhou\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: O fwrite falhou: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "o argumento não é um pacote RPM\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Não consigo assinar o RPM v1.0\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: não consigo assinar de novo o RPM v2.0\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: o writeLead falhou: %s\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: o rpmWriteSignature falhou: %s\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr ":%s: o readLead falhou\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr ":%s: o readLead falhou\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr ":%s: o readLead falhou\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr ":%s: o readLead falhou\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "NÃO-OK" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr " (FALTAM AS CHAVES:" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr " (CHAVES SUSPEITAS:" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "OK" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "NÃO" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "SIM" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2527,42 +2532,47 @@ msgstr "" "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n" "\t %s\tB %s\n" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "o pacote %s tem requisitos não satisfeitos: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "%s ignorado devido à opção missingok\n" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "========== mudanças de local\n" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, c-format msgid "%5d exclude %s\n" msgstr "%5d excluir o %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d mudar de local %s -> %s\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "a excluir o %s %s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "a mudar o %s para %s\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "a mudar a directoria %s para %s\n" @@ -2616,7 +2626,7 @@ msgstr " ... como %s\n" msgid "skipping %s - transfer failed - %s\n" msgstr "a ignorar o %s - a transferência falhou - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "o %s não pode ser instalado\n" @@ -2636,51 +2646,51 @@ msgstr "erro ao ler do ficheiros %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "o %s precisa duma versão mais recente do RPM\n" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "encontrados %d pacotes com código-fonte e %d binários\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "dependências falhadas:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "a instalar os pacotes binários\n" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "não consigo aceder ao ficheiro %s: %s\n" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "o \"%s\" especifica vários pacotes\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "não consigo aceder ao %s: %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "A instalar o %s\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "a leitura falhou: %s (%d)\n" @@ -2895,35 +2905,50 @@ msgstr "Não consigo ler o %s, a HOME é demasiado grande.\n" msgid "Unable to open %s for reading: %s.\n" msgstr "Não consegui abrir o %s para leitura: %s.\n" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "não consigo abrir a base de dados Packages em %s\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "número de pacote inválido: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "Falta um '(' em %s %s\n" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "número de pacote inválido: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "não consigo a base de dados do RPM em %s\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "linha: %s\n" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "A obter o %s\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3056,49 +3081,44 @@ msgstr "Precisa definir o \"%%_pgp_name\" no seu ficheiro de macros\n" msgid "Header+Payload size: " msgstr "Tamanho do cabeçalho demasiado grande" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "não verificar o SHA1 do cabeçalho" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "ignorar as assinaturas de MD5" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "Sem assinatura\n" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "'Digest' MD5 estragado: NÃO SUPORTADO\n" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Assinatura: tamanho(%d)+pad(%d)\n" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "%s ignorado devido à opção missingok\n" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" @@ -3111,7 +3131,7 @@ msgstr "a excluir a directoria %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3124,7 +3144,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3132,16 +3152,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "falta %s" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Dependências não satisfeitas para o %s-%s-%s: " @@ -3229,71 +3249,80 @@ msgstr "O %s tem um valor demasiado elevado ou pequeno, foi ignorado\n" msgid "%s has too large or too small integer value, skipped\n" msgstr "O %s tem um valor inteiro demasiado elevado ou pequeno, foi ignorado\n" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "falta um { depois do %" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "falta um } depois do %{" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "formato da opção em branco" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "nome da opção em branco" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "opção desconhecida" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "] esperado no fim do vector" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "] inesperado" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "} inesperado" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "esperado um ? na expressão" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "esperado um { a seguir ao ? na expressão" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "esperado um } na expressão" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "esperado um : a seguir à sub-expressão ?" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "esperado um { a seguir ao : na expressão" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "esperado um | no fim da expressão" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3317,178 +3346,178 @@ msgstr "verificar ficheiros da base de dados" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "gerar os cabeçalhos compatíveis com o formato do rpm[23]" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: nome de opção não reconhecido: \"%s\" ignorado\n" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "não consigo abrir o índice de %s usando o db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, c-format msgid "cannot open %s index\n" msgstr "não consigo abrir o índice do %s\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "não foi definido o dbpath\n" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "erro(%d) ao guardar o registo %s em %s\n" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, fuzzy, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: não consigo ler o cabeçalho em 0x%x\n" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "a remover o \"%s\" do índice %s.\n" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "a remover %d registos do índice %s.\n" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "erro(%d) ao guardar o registo %s em %s\n" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "erro(%d) ao remover o registo %s do %s\n" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "erro(%d) ao criar uma nova instância do pacote\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 #, fuzzy msgid "rpmdbAdd: skipping" msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "a adicionar o \"%s\" ao índice %s.\n" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "a adicionar %d registos ao índice %s.\n" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "erro(%d) ao guardar o registo %s em %s\n" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "a remover o %s depois duma reconstrução bem sucedida do db3.\n" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "não foi definido o dbpath" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "a reconstruir a base de dados %s em %s\n" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "A base de dados temporária %s já existe\n" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "a criar a directoria %s\n" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "a criar a directoria %s: %s\n" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "a abrir a base de dados antiga com a dbapi %d\n" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "a abrir a base de dados nova com a dbapi %d\n" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "o número do registo %u na base de dados está errado -- a ignorar.\n" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "não consigo adicionar o registo originalmente em %u\n" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "falhou a reconstrução da base de dados: a base de dados original mantém-se\n" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "falhou a substituição da base de dados antiga pela nova!\n" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "a remover a directoria %s\n" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "falhou a remoção da directoria %s: %s\n" @@ -3499,144 +3528,144 @@ msgid "======================== active %d empty %d\n" msgstr "======================== activo %d vazio %d\n" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(vazio)" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(vazio)\n" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "A macro %%%s tem o conteúdo incompleto\n" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "A macro %%%s tem um nome inválido (%%define)\n" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "A macro %%%s tem as opções incompletas\n" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "A macro %%%s tem o conteúdo em branco\n" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "A macro %%%s não conseguiu ser expandida\n" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "A macro %%%s tem um nome ilegal (%%undefine)\n" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "A macro %%%s (%s) não foi usada abaixo do nível %d\n" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Opção desconhecida %c em %s(%s)\n" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Nível de recursividade(%d) maior que o máximo(%d)\n" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c não terminado: %s\n" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Segue-se uma macro impossível de analisar ao %%\n" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "A macro %%%.*s não foi encontrada, por isso foi ignorada\n" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "Sobrecarga do tampão de destino\n" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "Ficheiro %s: %s\n" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "O ficheiro %s tem menos de %u bytes\n" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "Sucesso" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "Resposta errada do servidor" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "Erro de E/S do servidor" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "Tempo de espera pelo servidor expirado" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "Incapaz de descobrir o endereço da máquina do servidor" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "Incapaz de descobrir o nome da máquina do servidor" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "Não consegui ligar ao servidor" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "Não consigo estabelecer uma ligação de dados ao servidor" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "Erro de E/S no ficheiro local" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "Erro ao configurar o servidor remoto para o modo passivo" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "Ficheiro não encontrado no servidor" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "Interrupção em progresso" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "Erro desconhecido ou inesperado" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "a ligar ao %s como %s com senha %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 476ee3096..cdd721aa1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" @@ -123,7 +123,7 @@ msgstr "No consegui ler o arquivo spec de %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM verso %s\n" @@ -380,7 +380,7 @@ msgid "no arguments given" msgstr "no foi passado argumento para pesquisa" # , c-format -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 #, fuzzy msgid "Unable to open temp file.\n" msgstr "No consegui abrir: %s\n" @@ -393,280 +393,280 @@ msgstr "No consegui abrir: %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: build/build.c:218 +#: build/build.c:220 #, fuzzy, c-format msgid "Executing(%s): %s\n" msgstr "RPM verso %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, fuzzy, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "Construo falhou.\n" # , c-format -#: build/build.c:237 +#: build/build.c:239 #, fuzzy, c-format msgid "Bad exit status from %s (%s)\n" msgstr "No consegui abrir: %s\n" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" msgstr "" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" # , c-format -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "No consegui abrir: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" # , c-format -#: build/files.c:613 +#: build/files.c:597 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:623 +#: build/files.c:607 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:635 +#: build/files.c:619 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" # , c-format #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "No consegui abrir: %s\n" -#: build/files.c:987 +#: build/files.c:976 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "argumentos para o --dbpath devem comear com uma /" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" # , c-format -#: build/files.c:1152 +#: build/files.c:1141 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" # , c-format -#: build/files.c:1531 +#: build/files.c:1520 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:1555 +#: build/files.c:1544 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "no foi passado pacote para desinstalao" # , c-format -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "No consegui abrir: %s\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "argumentos para o --dbpath devem comear com uma /" # , c-format -#: build/files.c:1839 +#: build/files.c:1828 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "No consegui abrir: %s\n" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "no foi passado pacote para desinstalao" # , c-format -#: build/files.c:1916 +#: build/files.c:1905 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:2318 +#: build/files.c:2307 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "instale pacote" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "" @@ -799,7 +799,7 @@ msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" @@ -834,7 +834,7 @@ msgstr "No consegui abrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -898,18 +898,18 @@ msgid "line %d: Bad option %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, fuzzy, c-format msgid "line %d: Too many names: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, fuzzy, c-format msgid "line %d: Package does not exist: %s\n" msgstr "No consegui abrir: %s\n" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "" @@ -1009,7 +1009,7 @@ msgstr "No consegui abrir: %s\n" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "No consegui abrir: %s\n" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "" @@ -1208,33 +1208,33 @@ msgstr "No consegui abrir: %s\n" msgid "Unclosed %%if\n" msgstr "" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "" # , c-format -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 #, fuzzy msgid "No compatible architectures found for build\n" msgstr "%s no pode ser construido nesta arquitetura\n" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, fuzzy, c-format msgid "Package has no %%description: %s\n" msgstr "no foi passado pacote para desinstalao" @@ -1375,19 +1375,19 @@ msgstr "no verifique as dependncias do pacote" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "no verifique as dependncias do pacote" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "no verifique a arquitetura do pacote" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1489,7 +1489,7 @@ msgstr "" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 #, fuzzy msgid " failed - " msgstr "Construo falhou.\n" @@ -1499,77 +1499,77 @@ msgstr "Construo falhou.\n" msgid "package %s was already added, replacing with %s\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:438 +#: lib/depends.c:441 msgid "(rpmlib provides)" msgstr "" # , c-format -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:480 +#: lib/depends.c:483 msgid "(db provides)" msgstr "" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # , c-format -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "" @@ -1581,97 +1581,97 @@ msgstr "" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 msgid "(not a blob)" msgstr "" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "desconsidere quaisquer assinaturas PGP" # , c-format -#: lib/fs.c:74 +#: lib/fs.c:77 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "No consegui abrir o pipe tar: %s\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" # , c-format -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" # , c-format -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" # , c-format -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "No consegui abrir: %s\n" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "Construo falhou.\n" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "Construo falhou.\n" # , c-format -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "No consegui abrir: %s\n" @@ -1689,7 +1689,7 @@ msgid "cannot write to %%%s %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "No consegui abrir: %s\n" @@ -1727,185 +1727,185 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" # , c-format -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "No consegui abrir: %s\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "" # , c-format -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "mostra a verso do programa rpm sendo usado" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "envia a saida padro para <cmd>" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "use <diretrio> como diretrio raiz" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "mostra a verso do programa rpm sendo usado" # , c-format -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 #, fuzzy msgid "debug payload file state machine" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "No consegui abrir: %s\n" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 msgid "debug option/argument processing" msgstr "" # , c-format -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 #, fuzzy msgid "debug package state machine" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "No consegui abrir: %s\n" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2374,92 +2374,92 @@ msgstr "assine um pacote (descarte a assinatura corrente)" msgid "generate signature" msgstr "gere assinatura PGP" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:390 +#: lib/psm.c:394 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual <arquivo> pertence" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "" -#: lib/psm.c:747 +#: lib/psm.c:762 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" # , c-format -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2510,7 +2510,7 @@ msgid "package has neither file owner or id lists\n" msgstr "no foi passado pacote para instalao" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, fuzzy, c-format msgid "open of %s failed: %s\n" @@ -2525,73 +2525,79 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "no foram passados pacotes para assinatura" -#: lib/query.c:515 +#: lib/query.c:517 #, fuzzy msgid "no packages\n" msgstr "pesquise todos os pacotes" +# , c-format #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "No consegui abrir: %s\n" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:544 +#: lib/query.c:570 #, fuzzy, c-format msgid "no package triggers %s\n" msgstr "no foram passados pacotes para assinatura" # , c-format -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "no foram passados pacotes para assinatura" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" @@ -2618,122 +2624,127 @@ msgid "makeTempFile failed\n" msgstr "Construo falhou.\n" # , c-format -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, fuzzy, c-format msgid "%s: Fwrite failed: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "no foram passados pacotes para assinatura" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" # , c-format -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "No consegui abrir: %s\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr "" -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr "" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "no foi passado pacote para instalao" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" @@ -2745,13 +2756,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "RPM verso %s\n" # , c-format -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "No consegui abrir: %s\n" @@ -2764,19 +2775,19 @@ msgstr "No consegui abrir: %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "RPM verso %s\n" # , c-format -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, fuzzy, c-format msgid "relocating %s to %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "No consegui abrir: %s\n" @@ -2838,7 +2849,7 @@ msgstr "" msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "no foi passado pacote para instalao" @@ -2858,55 +2869,55 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "lista dependncias do pacote" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 #, fuzzy msgid "installing binary packages\n" msgstr "instale pacote" # , c-format -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" # , c-format -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" # , c-format -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "No consegui abrir: %s\n" @@ -3124,19 +3135,34 @@ msgid "Unable to open %s for reading: %s.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" +#: lib/rpmts.c:246 +#, c-format +msgid "extra '(' in package label: %s\n" +msgstr "" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "instale pacote" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "instale pacote" + # , c-format -#: lib/rpmts.c:341 +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" @@ -3149,20 +3175,20 @@ msgstr "No consegui ler o arquivo spec de %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "RPM verso %s\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3299,47 +3325,42 @@ msgstr "" msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "instale pacote" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "desconsidere quaisquer assinaturas MD5" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "gere assinatura PGP" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "" - # "Project-Id-Version: rpm-2.5.3\n" # "PO-Revision-Date: 1997-09-11 14:00 MET DST\n" # "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n" @@ -3349,7 +3370,7 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" @@ -3362,7 +3383,7 @@ msgstr "RPM verso %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3375,7 +3396,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3383,16 +3404,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, c-format msgid "missing %c %s" msgstr "" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "lista dependncias do pacote" @@ -3480,73 +3501,82 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 #, fuzzy msgid "unexpected ]" msgstr "fonte de pesquisa no esperado" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 #, fuzzy msgid "unexpected }" msgstr "fonte de pesquisa no esperado" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3570,179 +3600,179 @@ msgstr "pesquise todos os pacotes" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" # , c-format -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "no foi passado pacote para desinstalao" # , c-format -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "no foi passado pacote para instalao" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" @@ -3755,13 +3785,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "RPM verso %s\n" # , c-format -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "No consegui abrir: %s\n" @@ -3772,146 +3802,146 @@ msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" # , c-format -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "no foi passado pacote para desinstalao" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "" # , c-format #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -107,7 +107,7 @@ msgstr "" msgid "%s: %s\n" msgstr "" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "" @@ -327,271 +327,271 @@ msgstr "" msgid "no arguments given" msgstr "" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" msgstr "" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:518 +#: build/files.c:502 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1763 +#: build/files.c:1752 #, c-format msgid "%s: public key read failed.\n" msgstr "" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1839 +#: build/files.c:1828 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:2374 +#: build/files.c:2363 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "" @@ -701,7 +701,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -731,7 +731,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -791,17 +791,17 @@ msgstr "" msgid "line %d: Bad option %s: %s\n" msgstr "" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "" @@ -882,7 +882,7 @@ msgstr "" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "" @@ -1062,31 +1062,31 @@ msgstr "" msgid "Unclosed %%if\n" msgstr "" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 msgid "No compatible architectures found for build\n" msgstr "" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "" @@ -1211,17 +1211,17 @@ msgstr "" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 msgid "don't verify package digest(s)" msgstr "" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 msgid "don't verify database header(s) when retrieved" msgstr "" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 msgid "don't verify package signature(s)" msgstr "" @@ -1316,7 +1316,7 @@ msgstr "" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr "" @@ -1325,73 +1325,73 @@ msgstr "" msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:438 +#: lib/depends.c:441 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:467 +#: lib/depends.c:470 msgid "(db files)" msgstr "" -#: lib/depends.c:480 +#: lib/depends.c:483 msgid "(db provides)" msgstr "" -#: lib/depends.c:493 +#: lib/depends.c:496 msgid "(db package)" msgstr "" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "" @@ -1403,88 +1403,88 @@ msgstr "" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 msgid "(not a blob)" msgstr "" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 msgid "(not an OpenPGP signature)" msgstr "" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "" -#: lib/fs.c:213 +#: lib/fs.c:216 #, c-format msgid "%5d 0x%04x %s %s\n" msgstr "" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, c-format msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1499,7 +1499,7 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "" @@ -1537,171 +1537,171 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:843 +#: lib/package.c:852 #, c-format msgid "%s: headerRead failed: %s" msgstr "" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 msgid "print macro expansion of EXPR" msgstr "" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 msgid "send stdout to CMD" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 msgid "use ROOT as top level directory" msgstr "" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 msgid "use threads for file state machine" msgstr "" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 msgid "debug package state machine" msgstr "" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 msgid "use threads for package state machine" msgstr "" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2113,88 +2113,88 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "" -#: lib/psm.c:747 +#: lib/psm.c:762 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1418 +#: lib/psm.c:1439 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr "" -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2242,7 +2242,7 @@ msgid "package has neither file owner or id lists\n" msgstr "" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2257,71 +2257,76 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "" #: lib/query.c:535 #, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "" + +#: lib/query.c:561 +#, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, c-format msgid "malformed %s: %s\n" msgstr "" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, c-format msgid "no package matches %s: %s\n" msgstr "" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2343,141 +2348,146 @@ msgstr "" msgid "makeTempFile failed\n" msgstr "" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, c-format msgid "%s: not an rpm package\n" msgstr "" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, c-format msgid "%s: import read failed.\n" msgstr "" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, c-format msgid "%s: import failed.\n" msgstr "" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr "" -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr "" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "" @@ -2528,7 +2538,7 @@ msgstr "" msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2548,50 +2558,50 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "" @@ -2801,35 +2811,50 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, c-format +msgid "extra '(' in package label: %s\n" +msgstr "" + +#: lib/rpmts.c:264 +#, c-format +msgid "missing '(' in package label: %s\n" +msgstr "" + +#: lib/rpmts.c:272 +#, c-format +msgid "missing ')' in package label: %s\n" +msgstr "" + +#: lib/rpmts.c:448 #, c-format msgid "cannot open Solve database in %s\n" msgstr "" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, c-format msgid "Adding: %s\n" msgstr "" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, c-format msgid "Suggesting: %s\n" msgstr "" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -2960,46 +2985,41 @@ msgstr "" msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1146 +#: lib/signature.c:1152 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3012,7 +3032,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3025,7 +3045,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3033,16 +3053,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, c-format msgid "missing %c %s" msgstr "" -#: lib/verify.c:394 +#: lib/verify.c:397 #, c-format msgid "Unsatisfied dependencies for %s: " msgstr "" @@ -3130,71 +3150,80 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3216,176 +3245,176 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, c-format msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -3396,144 +3425,144 @@ msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 3a70d7890..a71711a7a 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -113,7 +113,7 @@ msgstr "" msgid "%s: %s\n" msgstr "" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "" @@ -333,271 +333,271 @@ msgstr "" msgid "no arguments given" msgstr "" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" msgstr "" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:518 +#: build/files.c:502 #, c-format msgid "Missing %s in %s %s\n" msgstr "" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1763 +#: build/files.c:1752 #, c-format msgid "%s: public key read failed.\n" msgstr "" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1839 +#: build/files.c:1828 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:2374 +#: build/files.c:2363 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "" @@ -707,7 +707,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -737,7 +737,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -797,17 +797,17 @@ msgstr "" msgid "line %d: Bad option %s: %s\n" msgstr "" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "" @@ -888,7 +888,7 @@ msgstr "" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "" @@ -1068,31 +1068,31 @@ msgstr "" msgid "Unclosed %%if\n" msgstr "" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 msgid "No compatible architectures found for build\n" msgstr "" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "" @@ -1217,17 +1217,17 @@ msgstr "" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 msgid "don't verify package digest(s)" msgstr "" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 msgid "don't verify database header(s) when retrieved" msgstr "" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 msgid "don't verify package signature(s)" msgstr "" @@ -1322,7 +1322,7 @@ msgstr "" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr "" @@ -1331,73 +1331,73 @@ msgstr "" msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:438 +#: lib/depends.c:441 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:467 +#: lib/depends.c:470 msgid "(db files)" msgstr "" -#: lib/depends.c:480 +#: lib/depends.c:483 msgid "(db provides)" msgstr "" -#: lib/depends.c:493 +#: lib/depends.c:496 msgid "(db package)" msgstr "" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "" @@ -1409,88 +1409,88 @@ msgstr "" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 msgid "(not a blob)" msgstr "" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 msgid "(not an OpenPGP signature)" msgstr "" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "" -#: lib/fs.c:213 +#: lib/fs.c:216 #, c-format msgid "%5d 0x%04x %s %s\n" msgstr "" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, c-format msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1505,7 +1505,7 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "" @@ -1543,171 +1543,171 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:843 +#: lib/package.c:852 #, c-format msgid "%s: headerRead failed: %s" msgstr "" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 msgid "print macro expansion of EXPR" msgstr "" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 msgid "send stdout to CMD" msgstr "" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 msgid "use ROOT as top level directory" msgstr "" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 msgid "debug payload file state machine" msgstr "" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 msgid "use threads for file state machine" msgstr "" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 msgid "debug package state machine" msgstr "" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 msgid "use threads for package state machine" msgstr "" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2119,88 +2119,88 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "" -#: lib/psm.c:747 +#: lib/psm.c:762 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1418 +#: lib/psm.c:1439 msgid "Unable to reload signature header\n" msgstr "" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr "" -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2248,7 +2248,7 @@ msgid "package has neither file owner or id lists\n" msgstr "" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2263,71 +2263,76 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "" #: lib/query.c:535 #, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "" + +#: lib/query.c:561 +#, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, c-format msgid "malformed %s: %s\n" msgstr "" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, c-format msgid "no package matches %s: %s\n" msgstr "" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2349,141 +2354,146 @@ msgstr "" msgid "makeTempFile failed\n" msgstr "" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, c-format msgid "%s: not an rpm package\n" msgstr "" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, c-format msgid "%s: import read failed.\n" msgstr "" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, c-format msgid "%s: import failed.\n" msgstr "" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr "" -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr "" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "" @@ -2534,7 +2544,7 @@ msgstr "" msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,50 +2564,50 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "" @@ -2807,35 +2817,50 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, c-format +msgid "extra '(' in package label: %s\n" +msgstr "" + +#: lib/rpmts.c:264 +#, c-format +msgid "missing '(' in package label: %s\n" +msgstr "" + +#: lib/rpmts.c:272 +#, c-format +msgid "missing ')' in package label: %s\n" +msgstr "" + +#: lib/rpmts.c:448 #, c-format msgid "cannot open Solve database in %s\n" msgstr "" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, c-format msgid "Adding: %s\n" msgstr "" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, c-format msgid "Suggesting: %s\n" msgstr "" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -2966,46 +2991,41 @@ msgstr "" msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1146 +#: lib/signature.c:1152 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3018,7 +3038,7 @@ msgstr "" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3031,7 +3051,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3039,16 +3059,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, c-format msgid "missing %c %s" msgstr "" -#: lib/verify.c:394 +#: lib/verify.c:397 #, c-format msgid "Unsatisfied dependencies for %s: " msgstr "" @@ -3136,71 +3156,80 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3222,176 +3251,176 @@ msgstr "" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, c-format msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -3402,144 +3431,144 @@ msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -110,7 +110,7 @@ msgstr "ïÂÝÉÅ ÐÁÒÁÍÅÔÒÙ ÄÌÑ ×ÓÅÈ ÒÅÖÉÍÏ×:" msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM ×ÅÒÓÉÑ %s\n" @@ -345,27 +345,27 @@ msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ" msgid "no arguments given" msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ.\n" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "÷ÙÐÏÌÎÑÅÔÓÑ(%s): %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "÷ÙÐÏÌÎÉÔØ %s ÎÅ ÕÄÁÌÏÓØ (%s): %s\n" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "îÅ×ÅÒÎÙÊ ËÏÄ ×ÏÚ×ÒÁÔÁ ÉÚ %s (%s)\n" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" @@ -375,208 +375,208 @@ msgstr "" "\n" "ïÛÉÂËÉ ÓÂÏÒËÉ ÐÁËÅÔÏ×:\n" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ ÐÒÉ ÁÎÁÌÉÚÅ ==\n" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ ÐÒÉ ÁÎÁÌÉÚÅ &&\n" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ ÐÒÉ ÁÎÁÌÉÚÅ ||\n" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "ÏÛÉÂËÁ ÁÎÁÌÉÚÁ ×ÙÒÁÖÅÎÉÑ\n" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "ÎÅÚÁËÒÙÔÁÑ (\n" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "- ÔÏÌØËÏ ÄÌÑ ÞÉÓÅÌ\n" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "! ÔÏÌØËÏ ÄÌÑ ÞÉÓÅÌ\n" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "ÔÉÐÙ ÄÏÌÖÎÙ ÓÏ×ÐÁÄÁÔØ\n" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "* / ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÄÌÑ ÓÔÒÏË\n" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "- ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÄÌÑ ÓÔÒÏË\n" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "&& É || ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÄÌÑ ÓÔÒÏË\n" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ × ×ÙÒÁÖÅÎÉÉ\n" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "ïÛÉÂËÁ TIMECHECK: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "ïÔÓÕÔÓÔ×ÕÅÔ '(' × %s %s\n" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ')' × %s(%s\n" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "îÅ×ÅÒÎÙÊ ÔÏËÅÎ %s: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, c-format msgid "Missing %s in %s %s\n" msgstr "ïÔÓÕÔÓÔ×ÕÅÔ %s × %s %s\n" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "îÅ ÐÒÏÂÅÌ ÓÌÅÄÕÅÔ ÐÏÓÌÅ %s(): %s\n" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "îÅ×ÅÒÎÙÊ ÓÉÎÔÁËÓÉÓ: %s(%s)\n" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "îÅ×ÅÒÎÙÅ ÐÒÁ×Á: %s(%s)\n" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "îÅ×ÅÒÎÙÅ ÐÒÁ×Á ÎÁ ËÁÔÁÌÏÇ %s(%s)\n" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "îÅÏÂÙÞÎÁÑ ÄÌÉÎÁ locale: \"%.*s\" × %%lang(%s)\n" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "äÕÂÌÉËÁÔ locale %.*s × %%lang(%s)\n" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "ìÉÍÉÔ ÄÌÑ %%docdir ÐÒÅ×ÙÛÅÎ\n" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "ôÏÌØËÏ ÏÄÉÎ ÁÒÇÕÍÅÎÔ ÄÌÑ %%docdir\n" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "ä×Á ÆÁÊÌÁ × ÏÄÎÏÊ ÓÔÒÏËÅ: %s\n" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó \"/\": %s\n" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "îÅÌØÚÑ ÓÍÅÛÉ×ÁÔØ ÓÐÅÃ. %%doc Ó ÄÒÕÇÉÍÉ ÆÏÒÍÁÍÉ: %s\n" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "æÁÊÌ ÕËÁÚÁÎ Ä×ÁÖÄÙ: %s\n" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "óÉÍ×ÏÌÉÞÅÓËÁÑ ÓÓÙÌËÁ ÕËÁÚÙ×ÁÅÔ ÎÁ BuildRoot: %s -> %s\n" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "æÁÊÌ ÎÅ ÓÏÏÔ×ÅÔÓÔÕÅÔ ÐÒÅÆÉËÓÕ (%s): %s\n" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ×Ï ×ÒÅÍÑ ÉÍÐÏÒÔÉÒÏ×ÁÎÉÑ.\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "%s: ÜÔÏ ÎÅ ÏÔËÒÙÔÙÊ ËÌÀÞ.\n" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó \"/\": %s\n" -#: build/files.c:1839 +#: build/files.c:1828 #, c-format msgid "Glob not permitted: %s\n" msgstr "Glob ÎÅ ÒÁÚÒÅÛÁÀÔÓÑ: %s\n" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %%files %s: %s\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "ÓÔÒÏËÁ: %s\n" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "îÅ×ÅÒÎÙÊ ÆÁÊÌ %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "îÅ×ÅÒÎÁÑ ÐÁÒÁ ×ÌÁÄÅÌÅÃ/ÇÒÕÐÐÁ: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "ðÒÏ×ÅÒËÁ ÎÁ ÎÅÕÐÁËÏ×ÁÎÎÙÊ(Å) ÆÁÊÌ(Ù): %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" @@ -585,36 +585,36 @@ msgstr "" "ïÂÎÁÒÕÖÅÎ(Ù) ÕÓÔÁÎÏ×ÌÅÎÎÙÊ(Å) (ÎÏ ÎÅ ÕÐÁËÏ×ÁÎÎÙÊ(Å)) ÆÁÊÌ(Ù):\n" "%s" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "ïÂÒÁÂÁÔÙ×ÁÀÔÓÑ ÆÁÊÌÙ: %s-%s-%s\n" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "getUname: ÓÌÉÛËÏÍ ÍÎÏÇÏ uid\n" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "getUnameS: ÓÌÉÛËÏÍ ÍÎÏÇÏ uid\n" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "getUidS: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ×\n" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "getGname: ÓÌÉÛËÏÍ ÍÎÏÇÏ gid\n" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "getGnameS: ÓÌÉÛËÏÍ ÍÎÏÇÏ gid\n" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "getGidS: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÇÒÕÐÐ.\n" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ËÁÎÏÎÉÚÉÒÏ×ÁÔØ ÉÍÑ ËÏÍÐØÀÔÅÒÁ: %s\n" @@ -724,7 +724,7 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ÐÏÄÐÉÓÉ.\n" msgid "Could not open %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n" @@ -754,7 +754,7 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÉÚ %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "úÁÐÉÓÁÎ: %s\n" @@ -814,17 +814,17 @@ msgstr "ÓÔÒÏËÁ %d: ïÛÉÂËÁ ÁÎÁÌÉÚÁ %%description: %s\n" msgid "line %d: Bad option %s: %s\n" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÐÁÒÁÍÅÔÒ %s: %s\n" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "ÓÔÒÏËÁ %d: óÌÉÛËÏÍ ÍÎÏÇÏ ÉÍÅÎ: %s\n" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "ÓÔÒÏËÁ %d: ðÁËÅÔ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ: %s\n" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÅ ÏÐÉÓÁÎÉÅ\n" @@ -905,7 +905,7 @@ msgstr "ÓÔÒÏËÁ %d: ðÕÓÔÏÊ ÔÜÇ: %s\n" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "ÓÔÒÏËÁ %d: îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ '-' × %s: %s\n" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "BuildRoot ÎÅ ÍÏÖÅÔ ÂÙÔØ \"/\": %s\n" @@ -1087,31 +1087,31 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" msgid "Unclosed %%if\n" msgstr "îÅÚÁËÒÙÔÙÊ %%if\n" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "%s:%d: parseExpressionBoolean ËÏÄ ×ÏÚ×ÒÁÔÁ: %d\n" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "%s:%d: îÁÊÄÅÎ %%else ÂÅÚ %%if\n" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "%s:%d: îÁÊÄÅÎ %%endif ÂÅÚ %%if\n" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "ÎÅ×ÅÒÎÏÅ ÏÂßÑ×ÌÅÎÉÅ %%include\n" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 msgid "No compatible architectures found for build\n" msgstr "îÅ ÎÁÊÄÅÎÙ ÓÏ×ÍÅÓÔÉÍÙÅ ÁÒÈÉÔÅËÔÕÒÙ ÄÌÑ ÓÂÏÒËÉ.\n" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "ðÁËÅÔ ÎÅ ÉÍÅÅÔ %%description: %s\n" @@ -1247,17 +1247,17 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" "ÓÏÚÄÁÔØ ÚÁÇÏÌÏ×ÏË(ËÉ) ÐÁËÅÔÁ, ÓÏ×ÍÅÓÔÉÍÙÅ Ó (ÕÓÔÁÒÅ×ÛÉÍÉ) ÆÏÒÍÁÔÁÍÉ rpm[23]" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 msgid "don't verify package digest(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÄÁÊÄÖÅÓÔ ÐÁËÅÔÁ(Ï×)" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 msgid "don't verify database header(s) when retrieved" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁÇÏÌÏ×ËÉ, ÉÚ×ÌÅËÁÅÍÙÅ ÉÚ ÂÁÚÙ ÄÁÎÎÙÈ" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 msgid "don't verify package signature(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÏÄÐÉÓØ(É) × ÐÁËÅÔÅ(ÁÈ)" @@ -1352,7 +1352,7 @@ msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ" msgid "Archive file not in header" msgstr "æÁÊÌ ÁÒÈÉ×Á ÎÅ ÎÁÊÄÅÎ × ÚÁÇÏÌÏ×ËÅ ÐÁËÅÔÁ" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " @@ -1361,47 +1361,47 @@ msgstr "ÎÅ ÕÄÁÌÏÓØ - " msgid "package %s was already added, replacing with %s\n" msgstr "ÐÁËÅÔ %s ÕÖÅ ÂÙÌ ÄÏÂÁ×ÌÅÎ, ÚÁÍÅÎÑÅÔÓÑ %s\n" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "(ËÜÛÉÒÏ×ÁÎ)" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "(rpmrc provides)" -#: lib/depends.c:438 +#: lib/depends.c:441 msgid "(rpmlib provides)" msgstr "(rpmlib provides)" -#: lib/depends.c:467 +#: lib/depends.c:470 msgid "(db files)" msgstr "(db files)" -#: lib/depends.c:480 +#: lib/depends.c:483 msgid "(db provides)" msgstr "(db provides)" -#: lib/depends.c:493 +#: lib/depends.c:496 msgid "(db package)" msgstr "(db package)" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "ÉÇÎÏÒÉÒÏ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔ(É) ÉͣΠÐÁËÅÔÁ(Ï×) [%d]\t%s -> %s\n" -#: lib/depends.c:969 +#: lib/depends.c:972 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s \"%s\" ÉÚ ÓÏÒÔÉÒÏ×ÁÎÎÙÈ Ó×ÑÚÅÊ.\n" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1409,27 +1409,27 @@ msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÄÅÒÅ×Ï, ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "ÏÛÉÂËÁ rpmtsOrder, ÏÓÔÁÌÏÓØ %d ÜÌÅÍÅÎÔÏ×\n" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(ÎÅ ÞÉÓÌÏ)" @@ -1441,89 +1441,90 @@ msgstr "(ÎÅ base64)" msgid "(invalid type)" msgstr "(ÎÅÐÒÁ×ÉÌØÎÙÊ ÔÉÐ)" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 msgid "(not a blob)" msgstr "(not a blob)" -#: lib/formats.c:324 +#: lib/formats.c:338 #, fuzzy msgid "(invalid xml type)" msgstr "(ÎÅÐÒÁ×ÉÌØÎÙÊ ÔÉÐ)" -#: lib/formats.c:401 +#: lib/formats.c:423 msgid "(not an OpenPGP signature)" msgstr "(ÎÅ ÐÏÄÐÉÓØ ÆÏÒÍÁÔÁ OpenPGP)" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() ÎÅ ×ÏÚ×ÒÁÔÉÌ ÚÎÁÞÅÎÉÅ ÒÁÚÍÅÒÁ fugger: %s\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() ÎÅ ×ÏÚ×ÒÁÔÉÌ ÚÎÁÞÅÎÉÅ ÒÁÚÍÅÒÁ fugger: %s\n" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %s\n" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "æÁÊÌ%5d: %07o %s.%s\t %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "ÆÁÊÌ %s - ÎÁ ÎÅÉÚ×ÅÓÔÎÏÍ ÕÓÔÒÏÊÓÔ×Å\n" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +#, fuzzy +msgid "========== Directories not explicitly included in package:\n" msgstr "========= ëÁÔÁÌÏÇÉ, ËÏÔÏÒÙÅ ÎÅ ×ËÌÀÞÅÎÙ × ÐÁËÅÔ Ñ×ÎÏ:\n" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, c-format msgid "%10d %s\n" msgstr "%10d %s\n" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "ËÁÔÁÌÏÇ %s ÓÏÚÄÁÎ Ó ÐÒÁ×ÁÍÉ ÄÏÓÔÕÐÁ %04o.\n" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "ÆÁÊÌ ÁÒÈÉ×Á %s ÎÅ ÎÁÊÄÅÎ × ÓÐÉÓËÅ ÆÁÊÌÏ× ÚÁÇÏÌÏ×ËÁ\n" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "%s ÓÏÈÒÁÎÅÎ ËÁË %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: ËÁÔÁÌÏÇ ÎÅ ÐÕÓÔ\n" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "%s ÓÏÚÄÁÎ ËÁË %s\n" @@ -1538,7 +1539,7 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × %%%s %s\n" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n" @@ -1576,174 +1577,174 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, fuzzy, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" "ÔÏÌØËÏ ÐÏÄÐÉÓÉ ×ÅÒÓÉÉ 3 ÍÏÇÕÔ ÂÙÔØ ÐÒÏ×ÅÒÅÎÙ, ÐÒÏÐÕÓËÁÅÔÓÑ ÐÏÄÐÉÓØ ×ÅÒÓÉÉ %u" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "ÐÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM\n" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: ðÏÄÐÉÓØ ÎÅÄÏÓÔÕÐÎÁ\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: ÏÛÉÂËÁ headerRead\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: ÏÛÉÂËÁ Fread: %s\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "ÐÒÅÏÐÒÅÄÅÌÉÔØ MACRO ÓÏ ÚÎÁÞÅÎÉÅÍ EXPR" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "'MACRO EXPR'" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "ÏÐÒÅÄÅÌÉÔØ MACRO ÓÏ ÚÎÁÞÅÎÉÅÍ EXPR" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 msgid "print macro expansion of EXPR" msgstr "×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÍÁËÒÏÓÁ EXPR" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "'EXPR'" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <FILE:...> ×ÍÅÓÔÏ ÆÁÊÌÁ(Ï×) ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "<FILE:...>" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "ÚÁÐÒÅÔÉÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ libio(3) API" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 msgid "send stdout to CMD" msgstr "ÐÏÓÌÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ × CMD" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "CMD" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 msgid "use ROOT as top level directory" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ROOT ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "ROOT" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "ÏÔÏÂÒÁÚÉÔØ ÉÚ×ÅÓÔÎÙÅ ËÌÀÞÉ ÚÁÐÒÏÓÁ" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "ÐÏËÁÚÁÔØ ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ rpmrc É ÍÁËÒÏÓÏ×" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "×Ù×ÏÄÉÔØ ÍÉÎÉÍÕÍ ÓÏÏÂÝÅÎÉÊ" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "×Ù×ÏÄÉÔØ ÂÏÌÅÅ ÄÅÔÁÌØÎÙÅ ÓÏÏÂÝÅÎÉÑ" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "×Ù×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÜÔÏÊ ÐÒÇÒÁÍÍÙ" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 msgid "debug payload file state machine" msgstr "ÏÔÌÁÄËÁ ÍÁÛÉÎÙ ÓÏÓÔÏÑÎÉÑ ÐÒÉÓÏÅÄÉÎÅÎÎÙÈ ÆÁÊÌÏ× " -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "ÏÔÌÁÄËÁ ÍÁÛÉÎÙ ÓÏÓÔÏÑÎÉÑ ÐÒÉÓÏÅÄÉÎÅÎÎÙÈ ÆÁÊÌÏ× " -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "ÏÔÌÁÄËÁ ÐÒÏÔÏËÏÌÁ ÐÏÔÏËÁ ÄÁÎÎÙÈ" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 msgid "debug option/argument processing" msgstr "ÏÔÌÁÄËÁ ÏÂÒÁÂÏÔËÉ ÐÁÒÁÍÅÔÒÏ×/ÁÒÇÕÍÅÎÔÏ×" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 msgid "debug package state machine" msgstr "ÏÔÌÁÄËÁ ÍÁÛÉÎÙ ÓÏÓÔÏÑÎÉÑ ÐÁËÅÔÏ×" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "ÏÔÌÁÄËÁ ÍÁÛÉÎÙ ÓÏÓÔÏÑÎÉÑ ÐÁËÅÔÏ×" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "ÏÔÌÁÄËÁ ÐÒÏÃÅÓÓÁ ××ÏÄÁ/×Ù×ÏÄÁ rpmio" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "ÏÔÌÁÄËÁ ÏÂÒÁÂÏÔËÉ URL ËÜÛ" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "%s: ÔÁÂÌÉÃÁ ÐÁÒÁÍÅÔÒÏ× ÎÅÐÒÁ×ÉÌØÎÏ ÎÁÓÔÒÏÅÎÁ (%d)\n" @@ -2164,88 +2165,88 @@ msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÔÏ ÖÅ ÓÁÍÏÅ ÞÔÏ --addsign)" msgid "generate signature" msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ÐÏÄÐÉÓØ" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n" -#: lib/psm.c:470 -#, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +#: lib/psm.c:480 +#, fuzzy, c-format +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "%s: waitpid(%d) rc %d status %x\n" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "%s: %s(%s-%s-%s) ÐÒÏÐÕÓËÁÅÔÓÑ ÌÉÛÎÉÊ \"%s\".\n" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "%s: %s(%s-%s-%s) %sÚÁÐÕÓË ÓÉÎÈÒÏÎÎÏÇÏ ÓÃÅÎÁÒÉÑ\n" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" -#: lib/psm.c:741 +#: lib/psm.c:756 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "%s(%s-%s-%s) ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ, waitpid(%d) rc %d: %s\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "%s(%s-%s-%s) ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, ÒÅÚÕÌØÔÁÔ ÐÒÏ×ÅÒËÉ: %d\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ (%d), ÐÒÏÐÕÓËÁÅÔÓÑ %s\n" -#: lib/psm.c:1418 +#: lib/psm.c:1439 msgid "Unable to reload signature header\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ÐÏÄÐÉÓÉ\n" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n" @@ -2293,7 +2294,7 @@ msgid "package has neither file owner or id lists\n" msgstr "ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓÐÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID\n" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2308,71 +2309,76 @@ msgstr "ÏÛÉÂËÁ ÚÁÐÒÏÓÁ %s\n" msgid "old format source packages cannot be queried\n" msgstr "ÚÁÐÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ÐÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "%s: ÎÅ ÐÁËÅÔ (ÉÌÉ ÍÁÎÉÆÅÓÔ ÐÁËÅÔÁ) rpm : %s\n" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÏÄÅÒÖÉÔ ÎÉËÁËÉÈ ÐÁËÅÔÏ×\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, c-format msgid "malformed %s: %s\n" msgstr "ÏÛÉÂËÁ ÆÏÒÍÁÔÁ %s: %s.\n" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, c-format msgid "no package matches %s: %s\n" msgstr "ÎÉ ÏÄÉÎ ÐÁËÅÔ ÎÅ ÐÏÄÈÏÄÉÔ Ë %s: %s\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÔÒÅÂÕÅÔ %s\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ %s\n" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "ÆÁÊÌ %s: %s\n" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÁËÅÔÁ: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "ÎÏÍÅÒ ÚÁÐÉÓÉ ÐÁËÅÔÁ: %u\n" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2394,99 +2400,99 @@ msgstr "%s: ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ: %s\n" msgid "makeTempFile failed\n" msgstr "ÏÛÉÂËÁ makeTempFile\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: ÏÛÉÂËÁ Fwrite: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, c-format msgid "%s: not an rpm package\n" msgstr "%s: ÜÔÏ ÎÅ ÐÁËÅÔ RPM\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: îÅ ÍÏÇÕ ÐÏÄÐÉÓÁÔØ ÐÁËÅÔÙ v1\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: îÅ ÍÏÇÕ ÐÅÒÅÐÏÄÐÉÓÁÔØ ÐÁËÅÔÙ v2\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "%s: ÕÖÅ ÂÙÌ ÐÏÄÐÉÓÁÎ ËÌÀÞ£Í Ó ÉÄÅÎÔÉÆÉËÁÔÏÒÍ %s, ÐÒÏÐÕÓËÁÅÔÓÑ\n" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, c-format msgid "%s: import read failed.\n" msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ×Ï ×ÒÅÍÑ ÉÍÐÏÒÔÉÒÏ×ÁÎÉÑ.\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, c-format msgid "%s: import failed.\n" msgstr "%s: ÏÛÉÂËÁ ÉÍÐÏÒÔÉÒÏ×ÁÎÉÑ.\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, c-format msgid "%s: headerRead failed\n" msgstr "%s: ÏÛÉÂËÁ headerRead\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: ÏÛÉÂËÁ headerGetEntry\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: ðÏÄÐÉÓÉ ÎÅÔ (RPM v1.0)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "îå ïë" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr " (ïôóõôóô÷õàô ëìàþé:" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr " (îåô äï÷åòéñ ë ëìàþáí:" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "ïë" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "îåT" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "äá" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2496,42 +2502,47 @@ msgstr "" "\"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "ÐÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ %s: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "========== ÐÅÒÅÍÅÝÅÎÉÊ\n" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ÉÓËÌÀÞÅÎ %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d ÐÅÒÅÍÅÝÅÎÉÅ %s -> %s\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ %s %s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ %s × %s\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n" @@ -2582,7 +2593,7 @@ msgstr " ... ËÁË %s\n" msgid "skipping %s - transfer failed - %s\n" msgstr "%s ÐÒÏÐÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2602,50 +2613,50 @@ msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 msgid "Failed dependencies:\n" msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr " ðÒÅÄÌÁÇÁÅÍÏÅ ÒÁÚÒÅÛÅÎÉÅ:\n" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "ïÔËÁÔ ÐÁËÅÔÏ× (+%d/-%d) ÎÁ %-24.24s (0x%08x):\n" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ: %s (%d)\n" @@ -2856,36 +2867,51 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s, ÚÎÁÞÅÎÉÅ HOME ÓÌÉÛËÏÍ ×ÅÌÉËÏ.\n" msgid "Unable to open %s for reading: %s.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s.\n" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÁËÅÔÁ: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "ïÔÓÕÔÓÔ×ÕÅÔ '(' × %s %s\n" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÁËÅÔÁ: %s\n" + +#: lib/rpmts.c:448 #, c-format msgid "cannot open Solve database in %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÒÁÚÒÅÛÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ × %s\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, c-format msgid "Adding: %s\n" msgstr "äÏÂÁ×ÌÑÅÔÓÑ: %s\n" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, c-format msgid "Suggesting: %s\n" msgstr "ðÒÅÄÌÁÇÁÅÔÓÑ: %s\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 #, fuzzy msgid "mounted filesystems:\n" msgstr "ÓÔÒÏÉÔÓÑ ÓÐÉÓÏË ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3016,46 +3042,41 @@ msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n" msgid "Header+Payload size: " msgstr "ÒÁÚÍÅÒ úÁÇÏÌÏ×ËÁ É óÏÄÅÒÖÉÍÏÇÏ:" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "ÄÁÊÄÖÅÓÔ MD5:" -#: lib/signature.c:1071 +#: lib/signature.c:1075 msgid "Header SHA1 digest: " msgstr "ÄÁÊÄÖÅÓÔ SHA1 ÚÁÇÏÌÏ×ËÁ:" -#: lib/signature.c:1146 +#: lib/signature.c:1152 msgid "V3 RSA/MD5 signature: " msgstr "ÐÏÄÐÉÓØ RSA/MD5 V3: " -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "úÁÇÏÌÏ×ÏË " -#: lib/signature.c:1264 +#: lib/signature.c:1274 msgid "V3 DSA signature: " msgstr "ÐÏÄÐÉÓØ DSA V3: " -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "ðÒÏ×ÅÒËÁ ÐÏÄÐÉÓÉ: îåðòá÷éìøîùå ðáòáíåôòù\n" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "ëÏÎÔÒ. ÓÕÍÍÁ MD5 ÐÏ×ÒÅÖÄÅÎÁ: îå ðïääåòöé÷áåôóñ\n" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "ðÏÄÐÉÓØ: îåéú÷åóôîï (%d)\n" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" @@ -3068,7 +3089,7 @@ msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, fuzzy, c-format msgid "sanity checking %d elements\n" msgstr "ÐÒÏ×eÒÑÅÔÓÑ %d ÜÌÅÍÅÎÔÏ×\n" @@ -3081,7 +3102,7 @@ msgstr "ÐÒÏ×eÒÑÅÔÓÑ %d ÜÌÅÍÅÎÔÏ×\n" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "ÐÏÄÓÞÉÔÙ×ÁÅÔÓÑ ÏÔÐÅÞÁÔÏË(ËÉ) %d ÆÁÊÌÁ(Ï×)\n" @@ -3089,16 +3110,16 @@ msgstr "ÐÏÄÓÞÉÔÙ×ÁÅÔÓÑ ÏÔÐÅÞÁÔÏË(ËÉ) %d ÆÁÊÌÁ(Ï×)\n" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "ÐÏÄÓÞÉÔÙ×ÁÅÔÓÑ ÄÉÓÐÏÚÉÃÉÑ ÆÁÊÌÏ×\n" -#: lib/verify.c:285 +#: lib/verify.c:288 #, c-format msgid "missing %c %s" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %c %s" -#: lib/verify.c:394 +#: lib/verify.c:397 #, c-format msgid "Unsatisfied dependencies for %s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s: " @@ -3187,71 +3208,80 @@ msgid "%s has too large or too small integer value, skipped\n" msgstr "" "%s ÉÍÅÅÔ ÓÌÉÛËÏÍ ÍÁÌÕÀ ÉÌÉ ÓÌÉÛËÏÍ ÂÏÌØÛÕÀ ×ÅÌÉÞÉÎÕ integer, ÐÒÏÐÕÝÅÎÏ\n" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"{\" ÐÏÓÌÅ \"%\"" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"}\" ÐÏÓÌÅ \"%{\"" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "ÐÕÓÔÏÊ ÆÏÒÍÁÔ ÔÜÇÁ" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "ÐÕÓÔÏÅ ÉÍÑ ÔÜÇÁ" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "× ËÏÎÃÅ ÍÁÓÓÉ×Á ÏÖÉÄÁÌÁÓØ \"]\"" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"]\"" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"}\"" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"?\"" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \"{\"" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"}\"" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \":\"" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \":\" ÏÖÉÄÁÌÏÓØ \"{\"" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "× ËÏÎÃÅ ×ÙÒÁÖÅÎÉÑ ÏÖÉÄÁÌÓÑ \"|\"" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3275,180 +3305,180 @@ msgstr "ÐÒÏ×ÅÒÉÔØ ÆÁÊÌÙ ÂÁÚÙ ÄÁÎÎÙÈ" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "ÓÏÚÄÁÔØ ÚÁÇÏÌÏ×ËÉ, ÓÏ×ÍÅÓÔÉÍÙÅ Ó (ÕÓÔÁÒÅ×ÛÉÍÉ) ÐÁËÅÔÁÍÉ rpm[23]" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: ÉÍÑ ËÌÀÞÁ \"%s\" ÎÅ ÉÚ×ÅÓÔÎÏ, ÉÇÎÏÒÉÒÕÅÔÓÑ\n" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s ÉÓÐÏÌØÚÕÑ db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, c-format msgid "cannot open %s index\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 #, fuzzy msgid "miFreeHeader: skipping" msgstr "rpmdb: ÐÒÏÐÕÓËÁÅÔÓÑ" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "ÏÛÉÂËÁ (%d) ÓÏÈÒÁÎÅÎÉÑ ÚÁÐÉÓÉ #%d × %s\n" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 #, fuzzy msgid "rpmdbNextIterator: skipping" msgstr "rpmdb: ÐÒÏÐÕÓËÁÅÔÓÑ" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u -- ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÄÇÏÔÏ×ËÉ ÚÁÐÉÓÉ ÚÁÇÏÌÏ×ËÁ #%d ÄÌÑ ÕÄÁÌÅÎÉÑ %s\n" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ \"%s\" ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÓÏÈÒÁÎÅÎÉÑ ÚÁÐÉÓÉ \"%s\" × %s\n" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 #, fuzzy msgid "rpmdbAdd: skipping" msgstr "rpmdb: ÐÒÏÐÕÓËÁÅÔÓÑ" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "ÚÁÇÏÌÏ×ÏË ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÙÊ -- ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" @@ -3459,144 +3489,144 @@ msgid "======================== active %d empty %d\n" msgstr "====================== ÁËÔÉ×ÎÙÈ %d ÐÕÓÔÙÈ %d\n" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(ÐÕÓÔÏ)" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(ÐÕÓÔÏ)\n" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "îÅÚÁËÒÙÔÙÊ ÍÁËÒÏÓ %%%s\n" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%define) ÍÁËÒÏÓÁ %%%s\n" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "îÅÚÁËÒÙÔÙÅ ÐÁÒÁÍÅÔÒÙ × ÍÁËÒÏÓÅ %%%s\n" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "íÁËÒÏÓ %%%s ÐÕÓÔ\n" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ ÍÁËÒÏÓ %%%s\n" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%undefine) ÍÁËÒÏÓÁ %%%s\n" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "íÁËÒÏÓ %%%s (%s) ÎÅ ÂÙÌ ÉÓÐÏÌØÚÏ×ÁÎ ÎÉÖÅ ÕÒÏ×ÎÑ %d\n" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ %c × %s(%s)\n" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ(%d) ÂÏÌØÛÅ ÄÏÐÕÓÔÉÍÏÊ(%d)\n" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "îÅÚÁËÒÙÔÁÑ %c: %s\n" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "ÎÅÐÏÎÑÔÎÙÊ ÍÁËÒÏÓ ÐÏÓÌÅ %%\n" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "íÁËÒÏÓ %%%.*s ÎÅ ÎÁÊÄÅÎ, ÐÒÏÐÕÓËÁÀ\n" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÃÅÌÅ×ÏÇÏ ÂÕÆÅÒÁ\n" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "æÁÊÌ %s: %s\n" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "äÌÉÎÁ ÆÁÊÌÁ %s ÍÅÎØÛÅ ÞÅÍ %u ÂÁÊÔ\n" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "÷ÙÐÏÌÎÅÎÏ" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "îÅ×ÅÒÎÙÊ ÏÔ×ÅÔ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "ôÁÊÍÁÕÔ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÁÄÒÅÓ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÉÍÑ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "îÅ ÍÏÇÕ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÄÌÑ ÄÁÎÎÙÈ Ó ÓÅÒ×ÅÒÏÍ" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "æÁÊÌÏ×ÁÑ ÏÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "ïÛÉÂËÁ ÐÒÉ ÐÅÒÅ×ÏÄÅ ÕÄÁÌÅÎÎÏÇÏ ÓÅÒ×ÅÒÁ × ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ ÎÁ ÓÅÒ×ÅÒÅ" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "ïÔÍÅÎÁ × ÐÒÏÃÅÓÓÅ" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÉÌÉ ÎÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "ÒÅÇÉÓÔÒÉÒÕÀÓØ × %s ËÁË %s, ÐÁÒÏÌØ %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -109,7 +109,7 @@ msgstr "" msgid "%s: %s\n" msgstr "súbor %s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM verzia %s\n" @@ -347,284 +347,284 @@ msgstr "neboli zadané ¾iadne argumenty pre overenie" msgid "no arguments given" msgstr "neboli zadané ¾iadne argumenty pre otázku" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Nie je mo¾né otvori» doèasný súbor" -#: build/build.c:218 +#: build/build.c:220 #, fuzzy, c-format msgid "Executing(%s): %s\n" msgstr "Vykonáva sa: %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, fuzzy, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "Vykonanie %s zlyhalo (%s)" -#: build/build.c:237 +#: build/build.c:239 #, fuzzy, c-format msgid "Bad exit status from %s (%s)\n" msgstr "Chybný výstupný kód z %s (%s)" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" msgstr "" -#: build/expression.c:225 +#: build/expression.c:228 #, fuzzy msgid "syntax error while parsing ==\n" msgstr "chyba syntaxe vo výraze" -#: build/expression.c:255 +#: build/expression.c:258 #, fuzzy msgid "syntax error while parsing &&\n" msgstr "chyba syntaxe vo výraze" -#: build/expression.c:264 +#: build/expression.c:267 #, fuzzy msgid "syntax error while parsing ||\n" msgstr "chyba syntaxe vo výraze" -#: build/expression.c:307 +#: build/expression.c:310 #, fuzzy msgid "parse error in expression\n" msgstr "chyba pri analýze výrazu" -#: build/expression.c:347 +#: build/expression.c:352 #, fuzzy msgid "unmatched (\n" msgstr "nepárová (" -#: build/expression.c:377 +#: build/expression.c:382 #, fuzzy msgid "- only on numbers\n" msgstr "- ibe pre èísla" -#: build/expression.c:393 +#: build/expression.c:398 #, fuzzy msgid "! only on numbers\n" msgstr "! iba pre èísla" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 #, fuzzy msgid "types must match\n" msgstr "typy sa musia zhodova»" -#: build/expression.c:453 +#: build/expression.c:459 #, fuzzy msgid "* / not suported for strings\n" msgstr "* / nie sú podporované pre re»azce" -#: build/expression.c:510 +#: build/expression.c:517 #, fuzzy msgid "- not suported for strings\n" msgstr "- nie je podporované pre re»azce" -#: build/expression.c:668 +#: build/expression.c:676 #, fuzzy msgid "&& and || not suported for strings\n" msgstr "&& a || nie sú podporované pre re»azce" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 #, fuzzy msgid "syntax error in expression\n" msgstr "chyba syntaxe vo výraze" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "chyba PREKROÈENIA ÈASU: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "chýbajúce %s\n" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "chýbajúca ':' na %s:%d" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "Chybný %s prvok: %s" -#: build/files.c:518 +#: build/files.c:502 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "chýbajúce %s\n" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:613 +#: build/files.c:597 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Chybná %s() syntax: %s" -#: build/files.c:623 +#: build/files.c:607 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Chybná ¹pecifikácia práv %s(): %s" -#: build/files.c:635 +#: build/files.c:619 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Chybná ¹pecifikácia práv adresára %s(): %s" -#: build/files.c:793 +#: build/files.c:777 #, fuzzy, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Iba jeden záznam v %%lang(): %s" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, fuzzy, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Iba jeden záznam v %%lang(): %s" -#: build/files.c:933 +#: build/files.c:917 #, fuzzy, c-format msgid "Hit limit for %%docdir\n" msgstr "Dosiahnutý limit pre %%docdir" -#: build/files.c:939 +#: build/files.c:925 #, fuzzy, c-format msgid "Only one arg for %%docdir\n" msgstr "Iba jeden argument pre %%docdir" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "Dva súbory na riadku: %s" -#: build/files.c:987 +#: build/files.c:976 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "Súbory musia zaèína» znakom \"/\": %s" -#: build/files.c:1000 +#: build/files.c:989 #, fuzzy, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Nie je mo¾né mie¹a» ¹peciálne %%doc s inými formami: %s" -#: build/files.c:1152 +#: build/files.c:1141 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "Súbor zadaný dvakrát: %s." -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1531 +#: build/files.c:1520 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Súbor nesúhlasí s prefixom (%s): %s." -#: build/files.c:1555 +#: build/files.c:1544 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: readLead zlyhalo\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Súbor potrebuje na zaèiatku \"/\": %s" -#: build/files.c:1839 +#: build/files.c:1828 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "riadok %d: V %s sú vy¾adované verzie: %s" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1916 +#: build/files.c:1905 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "riadok: %s" -#: build/files.c:2318 +#: build/files.c:2307 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "súbor %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Chybný vlastník/skupina: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "vyhµadáva sa balík %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Spracovávajú sa súbory: %s\n" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "Nie je mo¾né kanonizova» názov poèítaèa: %s\n" @@ -739,7 +739,7 @@ msgstr "Nie je mo¾né preèíta» ikonu: %s" msgid "Could not open %s: %s\n" msgstr "Otvorenie %s zlyhalo\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" @@ -769,7 +769,7 @@ msgstr "Nie je mo¾né preèíta» ikonu: %s" msgid "Unable to write payload to %s: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -829,17 +829,17 @@ msgstr "riadok %d: Chyba pri analýze %%description: %s" msgid "line %d: Bad option %s: %s\n" msgstr "riadok %d: Chybná voµba %s: %s" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, fuzzy, c-format msgid "line %d: Too many names: %s\n" msgstr "riadok %d: Priveµa názvov: %s" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, fuzzy, c-format msgid "line %d: Package does not exist: %s\n" msgstr "riadok %d: Balík neexistuje: %s" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, fuzzy, c-format msgid "line %d: Second description\n" msgstr "riadok %d: Druhý popis" @@ -920,7 +920,7 @@ msgstr "riadok %d: Prázdny popis: %s" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "riadok %d: Neprípustný znak '-' v %s: %s" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, fuzzy, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "riadok %d: BuildRoot nemô¾e by» \"/\": %s" @@ -1102,32 +1102,32 @@ msgstr "otvorenie zlyhalo: %s\n" msgid "Unclosed %%if\n" msgstr "Neuzavretý %%if" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, fuzzy, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "%s:%d: %%else bez if" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, fuzzy, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "%s:%d: %%endif bez if" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, fuzzy, c-format msgid "malformed %%include statement\n" msgstr "znetvorený príkaz %%include" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 #, fuzzy msgid "No compatible architectures found for build\n" msgstr "®iadne zostaviteµné architektúry" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, fuzzy, c-format msgid "Package has no %%description: %s\n" msgstr "Balík neobsahuje %%description: %s" @@ -1264,19 +1264,19 @@ msgstr "neoverova» závislosti balíka" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "neoverova» závislosti balíka" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "neoverova» architektúru balíka" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1377,7 +1377,7 @@ msgstr "Interná chyba" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr " zlyhalo - " @@ -1386,77 +1386,77 @@ msgstr " zlyhalo - " msgid "package %s was already added, replacing with %s\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:438 +#: lib/depends.c:441 #, fuzzy msgid "(rpmlib provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "chybný stav súboru: %s" -#: lib/depends.c:480 +#: lib/depends.c:483 #, fuzzy msgid "(db provides)" msgstr "Poskytuje:" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "nájdených %d balíkov\n" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(nie je èíslo)" @@ -1469,90 +1469,90 @@ msgstr "(nie je èíslo)" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 #, fuzzy msgid "(not a blob)" msgstr "(nie je èíslo)" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "vynecha» akékoµvek PGP podpisy" -#: lib/fs.c:74 +#: lib/fs.c:77 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() nevrátil veµkos» fuggeru: %s" -#: lib/fs.c:89 +#: lib/fs.c:92 #, fuzzy, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() nevrátil veµkos» fuggeru: %s" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "nepodarilo sa zisti» stav %s: %s" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "Súbor %4d: 0%o %s.%s\t %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, fuzzy, c-format msgid "file %s is on an unknown device\n" msgstr "súbor %s sa nachádza na neznámom zariadení" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "riadok %d: %s" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "varovanie: %s uchovaný ako %s" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "nie je mo¾né odstráni» %s - adresár nie je prázdny" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "rmdir %s zlyhalo: %s" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "varovanie: %s vytvorené ako %s" @@ -1567,7 +1567,7 @@ msgstr "nie je mo¾né zapísa» do %s: " msgid "cannot write to %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "chyba pri vytváraní doèasného súboru %s" @@ -1605,181 +1605,181 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3" -#: lib/package.c:778 +#: lib/package.c:786 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: rpmReadSignature zlyhalo\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: Podpis nie je k dispozícii\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: readLead zlyhalo\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "vypísa» verziu pou¾ívaného rpm" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "posla» ¹tandardný výstup do <príkazu>" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "pou¾i» <adresár> ako adresár najvy¹¹ej úrovne" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "vypísa» verziu pou¾ívaného rpm" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 #, fuzzy msgid "debug payload file state machine" msgstr "chybný stav súboru: %s" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "chybný stav súboru: %s" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 #, fuzzy msgid "debug option/argument processing" msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 #, fuzzy msgid "debug package state machine" msgstr "chybný stav súboru: %s" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "chybný stav súboru: %s" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2242,91 +2242,91 @@ msgstr "podpísa» balík (znièi» aktuálny podpis)" msgid "generate signature" msgstr "vytvori» PGP/GPG podpis" -#: lib/psm.c:270 +#: lib/psm.c:269 #, fuzzy msgid "source package expected, binary found\n" msgstr "oèakávaný zdrojový balík, nájdený binárny" -#: lib/psm.c:390 +#: lib/psm.c:394 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "%s vynechané - prenos zlyhal - %s\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "balík: %s-%s-%s test súborov = %d\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Nie je mo¾né preèíta» ikonu: %s" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "chyba formátu: %s\n" @@ -2376,7 +2376,7 @@ msgid "package has neither file owner or id lists\n" msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, fuzzy, c-format msgid "open of %s failed: %s\n" @@ -2391,72 +2391,77 @@ msgstr "otázka na %s zlyhala\n" msgid "old format source packages cannot be queried\n" msgstr "nie je mo¾né pýta» sa zdrojových balíkov v starom formáte\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "¾iadny z balíkov nespú¹»a %s\n" -#: lib/query.c:515 +#: lib/query.c:517 #, fuzzy msgid "no packages\n" msgstr "nájdených %d balíkov\n" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "neznámy tag" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s neobsahuje ¾iadne balíky\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "¾iadny z balíkov nespú¹»a %s\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Nie je mo¾né preèíta» %s: %s." -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "¾iadny z balíkov nespú¹»a %s\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "¾iadny z balíkov nevy¾aduje %s\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "¾iadny z balíkov neposkytuje %s\n" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "súbor %s: %s\n" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "chybné èíslo balíku: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "po¾aduje sa záznam èíslo %d\n" -#: lib/query.c:730 +#: lib/query.c:756 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" @@ -2480,142 +2485,147 @@ msgstr "%s: otvorenie zlyhalo\n" msgid "makeTempFile failed\n" msgstr "vykonanie zlyhalo\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, fuzzy, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "argument nie je RPM balík\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Nie je mo¾né podpísa» v1.0 RPM\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Nie je mo¾né znovu podpísa» v2.0 RPM\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmReadSignature zlyhalo\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Podpis nie je k dispozícii (v1.0 RPM)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "NIE JE V PORIADKU" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr " (CHÝBAJÚCE K¥ÚÈE):" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr " (NEDÔVERUJE SA K¥ÚÈOM: " -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "V PORIADKU" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "%s vynechané kvôli príznaku missingok\n" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je vynechaný: %s" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "presúva sa %s do %s\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "vynecháva sa %s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "presúva sa %s do %s\n" @@ -2669,7 +2679,7 @@ msgstr "... ako %s\n" msgid "skipping %s - transfer failed - %s\n" msgstr "%s vynechané - prenos zlyhal - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je mo¾né nain¹talova»\n" @@ -2689,51 +2699,51 @@ msgstr "chyba pri vytváraní doèasného súboru %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "nájdených %d zdrojových a %d binárnych balíkov\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "in¹talujú sa binárne balíky\n" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie je mo¾né otvori» súbor %s: %s" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¹pecifikuje viac balíkov\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "èítanie zlyhalo: %s (%d)" @@ -2944,35 +2954,50 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Nie je mo¾né otvori» %s pre èítanie: %s." -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "chybné èíslo balíku: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "chýbajúce %s\n" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "chybné èíslo balíku: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "riadok: %s" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "zdroje v: %s\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3109,49 +3134,44 @@ msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore" msgid "Header+Payload size: " msgstr "Priveµká hlavièka" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "zobrazi» súbory v balíku" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "vynecha» akékoµvek MD5 podpisy" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "Podpis nie je k dispozícii\n" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "%s vynechané kvôli príznaku missingok\n" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" @@ -3164,7 +3184,7 @@ msgstr "vytvára sa adresár %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3177,7 +3197,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3185,16 +3205,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "chýbajúce %s\n" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " @@ -3282,71 +3302,80 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "chýbajúce { po %" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "chýbajúce } po %{" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "prázdny tag formát" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "prázdne meno tagu" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "neznámy tag" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "] oèakávané na konci poµa" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "neoèakávané ]" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "neoèakávané }" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "? oèakávané vo výraze" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "{ oèakávané po ? vo výraze" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "} oèakávané vo výraze" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr ": oèakávané po ? podvýraze" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "{ oèakávané po : vo výraze" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "| oèakávené na konci výrazu" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3370,178 +3399,178 @@ msgstr "opýta» sa spec súboru" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "nie je mo¾né otvori» %s na %s:%d" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "nie je mo¾né otvori» %s\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 #, fuzzy msgid "no dbpath has been set\n" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "chyba pri naèítaní záznamu %s z %s" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "chyba pri naèítaní záznamu %s z %s" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje sa index skupín\n" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuje sa index názvov\n" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "chyba pri naèítaní záznamu %s z %s" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "chyba pri odstraòovaní záznamu %s z %s" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu sa vytvára databáza v adresári %s\n" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáza %s u¾ existuje" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otvára sa stará databáza\n" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie je mo¾né prida» záznam pôvodne na %d" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "nahradí súbory v %s súbormi z %s kvôli obnove" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" @@ -3552,147 +3581,147 @@ msgid "======================== active %d empty %d\n" msgstr "======================== aktívnych %d prázdnych %d\n" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(prázdne)" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(prázdne)\n" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, fuzzy, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s obsahuje neukonèené telo" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s obsahuje chybný názov (%%define)" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, fuzzy, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s obsahuje neukonèené voµby" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, fuzzy, c-format msgid "Macro %%%s has empty body\n" msgstr "Makro %%%s obsahuje prázdne telo" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, fuzzy, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makro %%%s sa nepodarilo expandova»" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s obsahuje chybný názov (%%undefine)" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, fuzzy, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) nebolo pou¾ité pod úrovòou %d " -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Neznáma voµba %c v %s(%s)" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, fuzzy, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Håbka rekurzie (%d) väè¹ia ako maximálna (%d)" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Neukonèené %c: %s" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "balík %%%.*s nebol nájdený, vynecháva sa" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 #, fuzzy msgid "Target buffer overflow\n" msgstr "Preplnenie cieµovej vyrovnávacej pamäti" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "Súbor %s: %s" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, fuzzy, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Súbor %s je men¹í ako %d bajtov" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "Úspech" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "Chybná odpoveï servera" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 #, fuzzy msgid "Server I/O error" msgstr "Chyba vstupu/výstupu servera" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "Prekroèenie èasového limitu servera" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "Nie je mo¾né vyhµada» adresu servera" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "Nie je mo¾né vyhµada» názov servera" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "Pripojenie k serveru zlyhalo" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "Vytvorenie dátového spojenia k serveru zlyhalo" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 #, fuzzy msgid "I/O error to local file" msgstr "Chyba vstupu/výstupu lokálneho súboru" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "Chyba pri nastavení vzdialeného servera do pasívneho re¾imu" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "Súbor sa na serveri nenachádza" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "Zru¹enie prebieha" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "Neznáma alebo neoèakávaná chyba" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "prihlasuje sa na %s ako %s, heslo %s\n" @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000. -# $Id: sl.po,v 1.380 2003/03/20 23:43:42 jbj Exp $ +# $Id: sl.po,v 1.381 2003/11/23 19:52:11 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -114,7 +114,7 @@ msgstr "" msgid "%s: %s\n" msgstr "datoteka %s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM razlièica %s\n" @@ -346,284 +346,284 @@ msgstr "argumenti za preverjanje niso podani" msgid "no arguments given" msgstr "argumenti za poizvedbo niso podani" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Zaèasne datoteke ni mo¾no odpreti" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "Izvajanje(%s): %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, fuzzy, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "Izvajanje %s je bilo neuspe¹no (%s): %s" -#: build/build.c:237 +#: build/build.c:239 #, fuzzy, c-format msgid "Bad exit status from %s (%s)\n" msgstr "%s javi neuspe¹no izhodno kodo (%s)" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" msgstr "" -#: build/expression.c:225 +#: build/expression.c:228 #, fuzzy msgid "syntax error while parsing ==\n" msgstr "napaka v skladnji pri razèlembi ==" -#: build/expression.c:255 +#: build/expression.c:258 #, fuzzy msgid "syntax error while parsing &&\n" msgstr "napaka v skladnji pri razèlembi &&" -#: build/expression.c:264 +#: build/expression.c:267 #, fuzzy msgid "syntax error while parsing ||\n" msgstr "napaka v skladnji pri razèlembi ||" -#: build/expression.c:307 +#: build/expression.c:310 #, fuzzy msgid "parse error in expression\n" msgstr "napaka pri razèlembi v izrazu" -#: build/expression.c:347 +#: build/expression.c:352 #, fuzzy msgid "unmatched (\n" msgstr "nezakljuèen (" -#: build/expression.c:377 +#: build/expression.c:382 #, fuzzy msgid "- only on numbers\n" msgstr "- samo na ¹tevilih" -#: build/expression.c:393 +#: build/expression.c:398 #, fuzzy msgid "! only on numbers\n" msgstr "! samo na ¹tevilih" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 #, fuzzy msgid "types must match\n" msgstr "tipi se morajo ujemati" -#: build/expression.c:453 +#: build/expression.c:459 #, fuzzy msgid "* / not suported for strings\n" msgstr "* in / nista podprta za nize" -#: build/expression.c:510 +#: build/expression.c:517 #, fuzzy msgid "- not suported for strings\n" msgstr "- ni podprt za nize" -#: build/expression.c:668 +#: build/expression.c:676 #, fuzzy msgid "&& and || not suported for strings\n" msgstr "&& in || nista podprta za nize" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 #, fuzzy msgid "syntax error in expression\n" msgstr "napaka v sklanji izraza" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK neuspe¹en: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "Manjkajoèi ,(` v %s %s" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "Manjkajoèi ,)` v %s(%s" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "Neveljaven ¾eton %s: %s" -#: build/files.c:518 +#: build/files.c:502 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "Manjkajoèi ,(` v %s %s" -#: build/files.c:575 +#: build/files.c:559 #, fuzzy, c-format msgid "Non-white space follows %s(): %s\n" msgstr "Neprazen znak sledi %s(): %s" -#: build/files.c:613 +#: build/files.c:597 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Nepravilna skladnja: %s(%s)" -#: build/files.c:623 +#: build/files.c:607 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Nepravilno doloèilo naèina: %s(%s)" -#: build/files.c:635 +#: build/files.c:619 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Nepravilno doloèilo naèina imenika: %s(%s)" -#: build/files.c:793 +#: build/files.c:777 #, fuzzy, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Nenavadna dol¾ina za locale: \"%.s\" pri %%lang(%s)" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, fuzzy, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Podvojeni locale %.*s za %%lang(%s)" -#: build/files.c:933 +#: build/files.c:917 #, fuzzy, c-format msgid "Hit limit for %%docdir\n" msgstr "Dosegli smo omejitev za %%docdir" -#: build/files.c:939 +#: build/files.c:925 #, fuzzy, c-format msgid "Only one arg for %%docdir\n" msgstr "Za %%docdir je podan samo en argument" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "Dve datoteki v eni vrstici: %s" -#: build/files.c:987 +#: build/files.c:976 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "Ime datoteke se mora zaèeti z \"/\": %s" -#: build/files.c:1000 +#: build/files.c:989 #, fuzzy, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Posebnih %%doc ni mo¾no me¹ati z ostalimi oblikami: %s" -#: build/files.c:1152 +#: build/files.c:1141 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "Datoteka je navedena dvakrat: %s" -#: build/files.c:1291 +#: build/files.c:1280 #, fuzzy, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Simbolna povezava ka¾e na BuildRoot: %s -> %s" -#: build/files.c:1531 +#: build/files.c:1520 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Datoteka se ne ujema s predpono (%s): %s" -#: build/files.c:1555 +#: build/files.c:1544 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datoteke ni mogoèe najti: %s" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Datoteki manjka uvodni \"/\": %s" -#: build/files.c:1839 +#: build/files.c:1828 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "vrstica %d: Razlièica ni dovoljena: %s" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Datoteke ni mo¾no najti z raz¹iritvijo metaznakov v imenu: %s" -#: build/files.c:1916 +#: build/files.c:1905 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Datoteke %s iz %%files ni mo¾no odpreti: %s" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "vrstica: %s" -#: build/files.c:2318 +#: build/files.c:2307 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "Po¹kodovana datoteka: %s: %s" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Neobstojeè lastnik/skupina: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "i¹èemo paket %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Obdeloavnje datotek: %s-%s-%s\n" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "Iskanje kanoniènega imena gostitelja je bilo neuspe¹no: %s\n" @@ -738,7 +738,7 @@ msgstr "Ikone %s ni mo¾no prebrati: %s" msgid "Could not open %s: %s\n" msgstr "Ni mo¾no odpreti %s: %s\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ni mo¾no zapisati paketa: %s" @@ -768,7 +768,7 @@ msgstr "Ikone %s ni mo¾no prebrati: %s" msgid "Unable to write payload to %s: %s\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -828,17 +828,17 @@ msgstr "vrstica %d: Napaka pri razèlembi v razdelku %%description: %s" msgid "line %d: Bad option %s: %s\n" msgstr "vrstica %d: Napaèna izbira %s: %s" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, fuzzy, c-format msgid "line %d: Too many names: %s\n" msgstr "vrstica %d: Preveè imen: %s" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, fuzzy, c-format msgid "line %d: Package does not exist: %s\n" msgstr "vrstica %d: Paket ne obstaja: %s" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, fuzzy, c-format msgid "line %d: Second description\n" msgstr "vrstica %d: Drugi opis" @@ -919,7 +919,7 @@ msgstr "vrstica %d: Prazna znaèka: %s" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "vrstica %d: Neveljaven znak ,-` v %s: %s" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, fuzzy, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "BuildRoot ne more biti \"/\": %s" @@ -1103,32 +1103,32 @@ msgstr "Ni mo¾no odpreti %s: %s\n" msgid "Unclosed %%if\n" msgstr "Nezakljuèeni %%if" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, fuzzy, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "%s:%d: parseExpressionBoolean vrne %d" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, fuzzy, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "%s:%d: Najden je bil %%else brez pripadajoèega if" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, fuzzy, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "%s:%d: Najden je bil %%endif brez pripadajoèega if" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, fuzzy, c-format msgid "malformed %%include statement\n" msgstr "Deformiran stavek %%include" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 #, fuzzy msgid "No compatible architectures found for build\n" msgstr "Arhitektura za izgradnjo ni prisotna" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, fuzzy, c-format msgid "Package has no %%description: %s\n" msgstr "V paketu manjka %%description: %s" @@ -1268,19 +1268,19 @@ msgstr "brez preverjanja soodvisnosti paketa" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "brez preverjanja soodvisnosti paketa" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "brez preverjanja arhitekture paketa" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1379,7 +1379,7 @@ msgstr "Notranja napaka" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr " neuspe¹no - " @@ -1388,78 +1388,78 @@ msgstr " neuspe¹no - " msgid "package %s was already added, replacing with %s\n" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:438 +#: lib/depends.c:441 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/depends.c:480 +#: lib/depends.c:483 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(ni ¹tevilo)" @@ -1472,90 +1472,90 @@ msgstr "(ni ¹tevilo)" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 #, fuzzy msgid "(not a blob)" msgstr "(ni ¹tevilo)" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "preskoèi vse podpise PGP" -#: lib/fs.c:74 +#: lib/fs.c:77 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() ni uspe¹no vrnila velikosti fugger: %s" -#: lib/fs.c:89 +#: lib/fs.c:92 #, fuzzy, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() ni uspe¹no vrnila velikosti fugger: %s" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "status %s ni na voljo: %s" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "Datoteka: %4d: %07o %s.%s\t %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, fuzzy, c-format msgid "file %s is on an unknown device\n" msgstr "datoteka %s se nahaja na neznani napravi" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "vrstica %d: %s" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "opozorilo: %s shranjen kot %s" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "ni mo¾no odstraniti %s - imenik ni prazen" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "odstranitev imenika %s je bila neuspe¹na: %s" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "opozorilo: %s ustvarjen kot %s" @@ -1570,7 +1570,7 @@ msgstr "ni mo¾no ustvariti %s: %s\n" msgid "cannot write to %%%s %s\n" msgstr "pisanje na %s ni mo¾no" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "napaka pri ustvarjanju zaèasne datoteke %s" @@ -1608,181 +1608,181 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3" -#: lib/package.c:778 +#: lib/package.c:786 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <=4" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: rpmReadSignature je bil neuspe¹en\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: Podpis ni na voljo\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "uporabljana razlièica rpm" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "standardni izhod preusmerjen na <ukaz>" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "uporabi <imenik> za korenski imenik" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "prika¾i znane znaèke za poizvedovanje" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "prika¾i konèni rpmrc in nastavitev makra" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "razlièica rpm, ki jo uporabljate" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 #, fuzzy msgid "debug payload file state machine" msgstr "okvarjeno stanje datoteke: %s" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "okvarjeno stanje datoteke: %s" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 #, fuzzy msgid "debug option/argument processing" msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 #, fuzzy msgid "debug package state machine" msgstr "okvarjeno stanje datoteke: %s" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "okvarjeno stanje datoteke: %s" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2242,91 +2242,91 @@ msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)" msgid "generate signature" msgstr "izdelava podpisa PGP/GPG" -#: lib/psm.c:270 +#: lib/psm.c:269 #, fuzzy msgid "source package expected, binary found\n" msgstr "prièakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:390 +#: lib/psm.c:394 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Ikone %s ni mo¾no prebrati: %s" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "raz¹iritev arhiva je bilo neuspe¹no%s%s: %s" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "napaka v obliki: %s\n" @@ -2376,7 +2376,7 @@ msgid "package has neither file owner or id lists\n" msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2391,72 +2391,77 @@ msgstr "poizvedba po %s je bila neuspe¹na\n" msgid "old format source packages cannot be queried\n" msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "noben paket ne pro¾i %s\n" -#: lib/query.c:515 +#: lib/query.c:517 #, fuzzy msgid "no packages\n" msgstr "ni paketov\n" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "neznana znaèka" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s ne vsebuje nobenega paketa\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "noben paket ne pro¾i %s\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Neuspe¹no branje %s: %s." -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "noben paket ne pro¾i %s\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "noben paket ne potrebuje %s\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "noben paket ne nudi %s\n" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "datoteka %s: %s\n" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "datoteka %s ni del nobenega paketa\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "neveljavna ¹tevilka paketa: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "¹tevilka zapisa paketa: %d\n" -#: lib/query.c:730 +#: lib/query.c:756 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "zapisa %d ni mo¾no prebrati\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" @@ -2480,100 +2485,100 @@ msgstr "%s: odpiranje je bilo neuspe¹no: %s\n" msgid "makeTempFile failed\n" msgstr "makeTempFile je bil neuspe¹en\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: pisanje Fwrite je bilo neuspe¹no: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "navedeni argument ni paket RPM\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Podpis RPM v1.0 ni mo¾en\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Sprememba podpisa RPM v2.0 ni mo¾na\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead je bil neuspe¹en: %s\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Podpis ni na voljo (RPM v1.0)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "NI DOBRO" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr " (MANJKAJOÈI KLJUÈI:" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr " (NEPREVERJENI KLJUÈI:" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "V REDU" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2582,42 +2587,47 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je izkljuèen: %s" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "premikanje %s v %s\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "izkljuèevanje datoteke %s%s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "premikanje %s v %s\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "premiokanje imenika %s v %s\n" @@ -2671,7 +2681,7 @@ msgstr " ... kot %s\n" msgid "skipping %s - transfer failed - %s\n" msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni mo¾no namestiti\n" @@ -2691,51 +2701,51 @@ msgstr "napaka pri branju iz datoteke %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "datoteka %s zahteva novej¹o razlièico RPM\n" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "najdeno %d izvornih in %d binarnih paketov\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "neuspe¹ne soodvisnosti:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "name¹èanje binarnih paketov\n" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "ni mo¾no odpreti datoteke %s: %s\n" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" doloèa veè paketov\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "ni mo¾no odpreti %s: %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "Name¹èanje %s\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "branje je bilo neuspe¹no: %s (%d)" @@ -2947,36 +2957,51 @@ msgstr "Ni mo¾no prebrati %s, HOME je prevelik." msgid "Unable to open %s for reading: %s.\n" msgstr "%s ni mo¾no odpreti za branje: %s." -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "neveljavna ¹tevilka paketa: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "Manjkajoèi ,(` v %s %s" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "neveljavna ¹tevilka paketa: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "datoteke %s/packages.rpm ni mogo¾no odpreti\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "vrstica: %s" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "izvori v: %s\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 #, fuzzy msgid "mounted filesystems:\n" msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3113,49 +3138,44 @@ msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\"" msgid "Header+Payload size: " msgstr "Glava je predolga" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "brez preverjanja datotek v paketu" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "preskoèi vse podpise MD5" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "Podpis manjka\n" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" @@ -3168,7 +3188,7 @@ msgstr "izkljuèevanje imenika %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3181,7 +3201,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3189,16 +3209,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "manjka %s\n" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " @@ -3288,71 +3308,80 @@ msgstr "" "%s ima preveliko ali premajhno vrednost malega (small) celega\n" "¹tevila, prezrto\n" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "manjkajoèi { za %" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "manjkajoèi } za %{" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "oblika znaèke manjka" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "ime znaèke manjka" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "neznana znaèka" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "na koncu polja je prièakovan ]" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "neprièakovan ]" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "neprièakovan }" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "v izrazu je prièakovan ?" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "v izrazu je za { prièakovan ?" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "v izrazu je prièakovan }" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "za podizrazom ? je prièakovano :" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "v izrazu je za : prièakovan {" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "na koncu izraza je prièakovan |" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3376,180 +3405,180 @@ msgstr "poizvedba po datoteki spec" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: neprepoznano ime znaèke: \"%s\" prezrto\n" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "ni mo¾no odpreti kazala %s z uporabo db%d - %s (%d)" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "ni mo¾no odpreti kazala %s:" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ni mo¾no prebrati glave pri 0x%x" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstranjevanje \"%s\" iz kazala %s.\n" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstranjevanje %d vnosov iz kazala %s\n" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "napaka(%d) pri brisanju zapisa %s iz %s" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "napaka(%d) pri iskanju paketa %s\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "dodajanje \"%s\" v kazalo %s.\n" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "dodajanje %d vnosov v kazalo %s.\n" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "zaèasna podatkovna zbirka %s ¾e obstaja" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "odpiranje stare podatkovne zbirke\n" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno." -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "zapisa ni mo¾no dodati na %d" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n" "istem mestu\n" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" @@ -3560,147 +3589,147 @@ msgid "======================== active %d empty %d\n" msgstr "======================== aktivni %d prazni %d\n" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(prazni)" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(prazni)\n" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, fuzzy, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s vsebuje nezakljuèeno telo" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s vsebuje nedovoljeno ime (%%define)" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, fuzzy, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s vsebuje nezakljuèene izbire" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, fuzzy, c-format msgid "Macro %%%s has empty body\n" msgstr "Makro %%%s vsebuje prazno telo" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, fuzzy, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makro %%%s se ne raz¹iri" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s vsebuje nedovoljeno ime (%%undefine)" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, fuzzy, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) ni bil uporabljen pod ravnijo %d" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Neznana izbira %c v %s(%s)" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, fuzzy, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Globina rekurzije (%d) veèja od maksimalne (%d)" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Nezakljuèeni %c: %s" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, fuzzy, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Oznaki %% sledi nerazèlenljiv makro" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Makro %%%.*s ni najden - preskoèeno" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 #, fuzzy msgid "Target buffer overflow\n" msgstr "Ciljni medpomnilnik je bil prekoraèen" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "Datoteka %s: %s" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, fuzzy, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Datoteka %s je kraj¹a od %d bajtov" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "Uspeh" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "Nepravilen odziv stre¾nika" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 #, fuzzy msgid "Server I/O error" msgstr "V/I napaka na stre¾niku" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "Èas odziva stre¾nika je potekel" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "Naslov stre¾nika ni ugotovljiv" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "Ime stre¾nika ni bilo ugotovljivo" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "Neuspe¹en poskus prikljuèitve na stre¾nik" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "Neuspe¹na vzpostavitev podatkovne povezave s stre¾nikom" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 #, fuzzy msgid "I/O error to local file" msgstr "V/I napaka na lokalni datoteki" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "Napaka pri nastavitvi oddaljenega stre¾nika v pasivni naèin" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "Datoteke ni mo¾no najti na stre¾niku" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "Prekinitev v teku" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "Neznana ali neprièakovana napaka" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "prijava na %s kot %s, geslo %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -107,7 +107,7 @@ msgstr "" msgid "%s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM verzija %s\n" @@ -344,277 +344,277 @@ msgstr "nedostaju argumenti za proveru" msgid "no arguments given" msgstr "nedostaju argumenti za upit" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" -#: build/build.c:218 +#: build/build.c:220 #, fuzzy, c-format msgid "Executing(%s): %s\n" msgstr "Pribavljam %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, fuzzy, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: build/build.c:237 +#: build/build.c:239 #, fuzzy, c-format msgid "Bad exit status from %s (%s)\n" msgstr "neuspelo otvaranje %s: %s" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" "RPM build errors:\n" msgstr "" -#: build/expression.c:225 +#: build/expression.c:228 #, fuzzy msgid "syntax error while parsing ==\n" msgstr "oèekivan znak ? u izrazu" -#: build/expression.c:255 +#: build/expression.c:258 #, fuzzy msgid "syntax error while parsing &&\n" msgstr "oèekivan znak ? u izrazu" -#: build/expression.c:264 +#: build/expression.c:267 #, fuzzy msgid "syntax error while parsing ||\n" msgstr "oèekivan znak ? u izrazu" -#: build/expression.c:307 +#: build/expression.c:310 #, fuzzy msgid "parse error in expression\n" msgstr "oèekivan znak ? u izrazu" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 #, fuzzy msgid "syntax error in expression\n" msgstr "oèekivan znak ? u izrazu" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, fuzzy, c-format msgid "Missing '(' in %s %s\n" msgstr "nedostaje { posle %" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, fuzzy, c-format msgid "Missing ')' in %s(%s\n" msgstr "nedostaje ':' na %s:%d" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, fuzzy, c-format msgid "Invalid %s token: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "nedostaje { posle %" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:613 +#: build/files.c:597 #, fuzzy, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:623 +#: build/files.c:607 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:635 +#: build/files.c:619 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, fuzzy, c-format msgid "Two files on one line: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:987 +#: build/files.c:976 #, fuzzy, c-format msgid "File must begin with \"/\": %s\n" msgstr "preme¹tanja moraju poèeti znakom '/'" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:1152 +#: build/files.c:1141 #, fuzzy, c-format msgid "File listed twice: %s\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1531 +#: build/files.c:1520 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:1555 +#: build/files.c:1544 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: Neuspeo 'readLead'\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "preme¹tanja moraju poèeti znakom '/'" -#: build/files.c:1839 +#: build/files.c:1828 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "paket %s nije naveden u %s" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1916 +#: build/files.c:1905 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, fuzzy, c-format msgid "line: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:2318 +#: build/files.c:2307 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "gre¹ka potrage za paketom %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "" @@ -728,7 +728,7 @@ msgstr "Ne mogu da upi¹em %s" msgid "Could not open %s: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ne mogu da upi¹em %s" @@ -758,7 +758,7 @@ msgstr "Ne mogu da upi¹em %s" msgid "Unable to write payload to %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -818,17 +818,17 @@ msgstr "paket %s nije naveden u %s" msgid "line %d: Bad option %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, fuzzy, c-format msgid "line %d: Too many names: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, fuzzy, c-format msgid "line %d: Package does not exist: %s\n" msgstr "paket %s nije naveden u %s" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "" @@ -909,7 +909,7 @@ msgstr "neuspelo otvaranje %s: %s" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "" @@ -1089,32 +1089,32 @@ msgstr "neuspelo otvaranje %s\n" msgid "Unclosed %%if\n" msgstr "" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 #, fuzzy msgid "No compatible architectures found for build\n" msgstr "nemoj proveravati arhitekturu paketa" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, fuzzy, c-format msgid "Package has no %%description: %s\n" msgstr "paket %s nije naveden u %s" @@ -1253,19 +1253,19 @@ msgstr "nemoj proveravati zavisnosti paketa" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "nemoj proveravati zavisnosti paketa" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "nemoj proveravati arhitekturu paketa" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1367,7 +1367,7 @@ msgstr "fatalna gre¹ka: " msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 #, fuzzy msgid " failed - " msgstr "PGP omanuo" @@ -1377,76 +1377,76 @@ msgstr "PGP omanuo" msgid "package %s was already added, replacing with %s\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:438 +#: lib/depends.c:441 #, fuzzy msgid "(rpmlib provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/depends.c:480 +#: lib/depends.c:483 msgid "(db provides)" msgstr "" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(nije broj)" @@ -1459,90 +1459,90 @@ msgstr "(nije broj)" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 #, fuzzy msgid "(not a blob)" msgstr "(nije broj)" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "preskoèi sve PGP potpise" -#: lib/fs.c:74 +#: lib/fs.c:77 #, fuzzy, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() nije vratio 'fugger' velièinu: %s" -#: lib/fs.c:89 +#: lib/fs.c:92 #, fuzzy, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() nije vratio 'fugger' velièinu: %s" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, fuzzy, c-format msgid "failed to stat %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +msgid "========== Directories not explicitly included in package:\n" msgstr "" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "ne mogu da uklonim %s - direktorijum nije prazan" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "neuspela komanda rmdir %s: %s" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " @@ -1557,7 +1557,7 @@ msgstr "Ne mogu da otvorim datoteku %s: " msgid "cannot write to %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" @@ -1595,180 +1595,180 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a" -#: lib/package.c:778 +#: lib/package.c:786 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: Neuspelo 'rpmReadSignature'\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: Potpis nije na raspolaganju\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "napi¹i verziju rpm-a koja se koristi" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "po¹alji standardni izlaz u <komandu>" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "koristi <dir> kao direktorijum najvi¹eg nivoa" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "napi¹i verziju rpm-a koja se koristi" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 #, fuzzy msgid "debug payload file state machine" msgstr "neuspelo otvaranje %s: %s" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "neuspelo otvaranje %s: %s" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 msgid "debug option/argument processing" msgstr "" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 #, fuzzy msgid "debug package state machine" msgstr "neuspelo otvaranje %s: %s" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "neuspelo otvaranje %s: %s" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2235,90 +2235,90 @@ msgstr "potpi¹i paket (ukloni tekuæi potpis)" msgid "generate signature" msgstr "napravi PGP potpis" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:390 +#: lib/psm.c:394 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "Ne mogu da upi¹em %s" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr "" -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "gre¹ka u formatu: %s\n" @@ -2369,7 +2369,7 @@ msgid "package has neither file owner or id lists\n" msgstr "paket nema imena" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, fuzzy, c-format msgid "open of %s failed: %s\n" @@ -2384,72 +2384,77 @@ msgstr "upit nad %s neuspeo\n" msgid "old format source packages cannot be queried\n" msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "nijedan paket ne aktivira %s\n" -#: lib/query.c:515 +#: lib/query.c:517 #, fuzzy msgid "no packages\n" msgstr "upit nad svim paketima" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "nepoznat tag" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "nijedan paket ne aktivira %s\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "Neuspelo èitanje %s: %s." -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "nijedan paket ne aktivira %s\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "nijedan paket ne zahteva %s\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "nijedan paket ne obezbeðuje %s\n" -#: lib/query.c:693 +#: lib/query.c:719 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/query.c:730 +#: lib/query.c:756 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -2473,142 +2478,147 @@ msgstr "%s: Neuspelo otvaranje\n" msgid "makeTempFile failed\n" msgstr "%s: Neuspelo otvaranje\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, fuzzy, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "gre¹ka: èini se da %s nije RPM paket\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Ne mogu da potpi¹em v1.0 RPM\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Ne mogu da ponovo potpi¹em v2.0 RPM\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: Neuspelo 'rpmReadSignature'\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 #, fuzzy msgid " (MISSING KEYS:" msgstr " (NEDOSTAJUÆI KLJUÈEVI)" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr "" -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr "" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Pribavljam %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Pribavljam %s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, fuzzy, c-format msgid "relocating %s to %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" @@ -2661,7 +2671,7 @@ msgstr "" msgid "skipping %s - transfer failed - %s\n" msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "gre¹ka: %s se ne mo¾e instalirati\n" @@ -2681,52 +2691,52 @@ msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "lo¹e meðuzavisnosti:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 #, fuzzy msgid "installing binary packages\n" msgstr "instaliraj paket" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" odreðuje vi¹e paketa\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, fuzzy, c-format msgid "read failed: %s (%d)\n" msgstr "neuspelo èitanje: %s (%d)" @@ -2937,35 +2947,50 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "pogre¹an broj paketa: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "nedostaje { posle %" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "pogre¹an broj paketa: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "Pribavljam %s\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3101,49 +3126,44 @@ msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci" msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "instaliraj paket" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "preskoèi sve MD5 potpise" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Potpis nije na raspolaganju\n" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" @@ -3156,7 +3176,7 @@ msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3169,7 +3189,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3177,16 +3197,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "nedostaje { posle %" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " @@ -3274,73 +3294,82 @@ msgstr "" msgid "%s has too large or too small integer value, skipped\n" msgstr "" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "nedostaje { posle %" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "nedostaje } posle %" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "prazan 'tag' format'" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "prazno ime tag-a" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "nepoznat tag" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "] oèekivano na kraju niza" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "neoèekivano ]" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "neoèekivano }" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "oèekivan znak ? u izrazu" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ oèekivano posle ? u izrazu" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "} oèekivano u izrazu" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "oèekivano : praæeno ? podizrazom" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 #, fuzzy msgid "{ expected after : in expression" msgstr "{ oèekivano posle : u izrazu" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "| oèekivano na kraju izraza" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3364,177 +3393,177 @@ msgstr "upit nad %s neuspeo\n" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "ne mogu da proèitam zaglavlje na %d za proveru" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "privremena baza podataka %s veæ postoji" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "ne mogu da dodam slog originalno na %d" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -3545,153 +3574,153 @@ msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "(nepoznat tip)" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "paket %s nije naðen u %s" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 #, fuzzy msgid "Bad server response" msgstr "Lo¹ odgovor FTP servera" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 #, fuzzy msgid "Server I/O error" msgstr "Ulazno/izlazna FTP gre¹ka" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 #, fuzzy msgid "Server timeout" msgstr "Tajm-aut FTP servera" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 #, fuzzy msgid "Unable to lookup server host address" msgstr "Ne mogu da odredim host adresu FTP servera" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 #, fuzzy msgid "Unable to lookup server host name" msgstr "Ne mogu da odredim ime FTP hosta" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 #, fuzzy msgid "Failed to connect to server" msgstr "Ne mogu da se pove¾em sa FTP serverom" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 #, fuzzy msgid "Failed to establish data connection to server" msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 #, fuzzy msgid "I/O error to local file" msgstr "Ulazno/izlazna gre¹ka kod lokalne datoteke" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "Gre¹ka kod stavljanja udaljenog servera u pasivni re¾im" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "Datoteka nije pronaðena na serveru" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Unknown or unexpected error" msgstr "Neoèekivana ili nepoznata FTP gre¹ka" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.2\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2003-02-05 12:40+0100\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -107,7 +107,7 @@ msgstr "Gemensamma flaggor för alla rpm-lägen:" msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM version %s\n" @@ -337,27 +337,27 @@ msgstr "inga parametrar angivna för verifiering" msgid "no arguments given" msgstr "inga argument angivna" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "Kan inte öppna temporär fil.\n" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "Kör(%s): %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "Körning (exec) av %s misslyckades (%s): %s\n" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "Dålig slutstatus från %s (%s)\n" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" @@ -367,208 +367,208 @@ msgstr "" "\n" "RPM-byggfel:\n" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "syntaxfel vid tolkning av ==\n" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "syntaxfel vid tolkning av &&\n" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "syntaxfel vid tolkning av ||\n" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "tolkningsfel i uttryck\n" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "ensam (\n" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "- endast i tal\n" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "! endast på tal\n" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "typer måste passa ihop\n" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "* / stöds inte för strängar\n" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "- stöds inte för strängar\n" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "&& och || stöds inte för strängar\n" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "syntaxfel i uttryck\n" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK-fel: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "\"(\" saknas i %s %s\n" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "\")\" saknas i %s(%s\n" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "Ogiltigt %s-element: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, c-format msgid "Missing %s in %s %s\n" msgstr "%s saknas i %s %s\n" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "Annat än blanktecken följer på %s(): %s\n" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Felaktig syntax: %s(%s)\n" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "Felaktig rättighetsspecifikation: %s(%s)\n" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "Felaktig specifikation av katalogrättigheter: %s(%s)\n" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "Ovanlig lokallängd: \"%.*s\" i %%lang(%s)\n" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "Duplicerad lokal %.*s i %%lang(%s)\n" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "Slog i gränsen för %%docdir\n" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "Endast ett argument till %%docdir\n" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "Två filer på en rad: %s\n" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "Filnamn måste börja med \"/\": %s\n" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Kan inte blanda special %%doc med andra former: %s\n" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "Filen uppräknad två gånger: %s\n" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolisk länk pekar på BuildRoot: %s -> %s\n" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Filen matchar inte prefixet (%s): %s\n" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "Filen hittades inte: %s\n" -#: build/files.c:1763 +#: build/files.c:1752 #, c-format msgid "%s: public key read failed.\n" msgstr "%s: läsning av publik nyckel misslyckades.\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "%s: inte en publik nyckel med skal.\n" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Filen behöver inledande \"/\": %s\n" -#: build/files.c:1839 +#: build/files.c:1828 #, c-format msgid "Glob not permitted: %s\n" msgstr "Matchning inte tillåtet: %s\n" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "Hittade ingen fil vid matchningen: %s\n" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunde inte öppna %%files-fil %s: %s\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "rad: %s\n" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "Felaktig fil: %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Felaktig ägare/grupp: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "Letar efter opackade fil(er): %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" @@ -577,36 +577,36 @@ msgstr "" "Installerade (men opaketerade) filer funna:\n" "%s" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Bearbetar filer: %s-%s-%s\n" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "getUname: för många uid\n" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "getUnameS: för många uid\n" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "getUidS: för många uid\n" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "getGname: för många gid\n" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "getGnameS: för många gid\n" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "getGidS: för många gid\n" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "Kunde inte kanonisera värdnamn: %s\n" @@ -716,7 +716,7 @@ msgstr "Kan inte läsa om signaturhuvud.\n" msgid "Could not open %s: %s\n" msgstr "Kunde inte öppna %s: %s\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunde inte skriva paket: %s\n" @@ -746,7 +746,7 @@ msgstr "Kan inte läsa last från %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Kan inte skriva last till %s: %s\n" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -806,17 +806,17 @@ msgstr "rad %d: Fel i tolkning av %%description: %s\n" msgid "line %d: Bad option %s: %s\n" msgstr "rad %d: otillåten flagga %s: %s\n" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "rad %d: För många namn: %s\n" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "rad %d: Paketet existerar inte: %s\n" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "rad %d: En andra beskrivning\n" @@ -897,7 +897,7 @@ msgstr "rad %d: Tom tagg: %s\n" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "rad %d: Otillåtet tecken \"-\" i %s: %s\n" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "BuildRoot kan inte vara \"/\": %s\n" @@ -1078,31 +1078,31 @@ msgstr "Kan inte öppna %s: %s\n" msgid "Unclosed %%if\n" msgstr "Oavslutat %%if\n" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "%s:%d: parseExpressionBoolean returnerar %d\n" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "%s:%d: Fick ett %%else utan något %%if\n" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "%s:%d: Fick ett %%endif utan något %%if\n" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "felformaterad %%include-sats\n" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 msgid "No compatible architectures found for build\n" msgstr "Hittade inga kompatibla arkitekturer att bygga\n" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "Paketet har ingen %%description: %s\n" @@ -1233,17 +1233,17 @@ msgstr "verifiera inte byggberoenden" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "generera pakethuvuden kompatibla med (äldre) rpm[23]-paketering" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 msgid "don't verify package digest(s)" msgstr "verifiera inte paketkontrollsummor" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 msgid "don't verify database header(s) when retrieved" msgstr "verifiera inte databashuvuden när de hämtas" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 msgid "don't verify package signature(s)" msgstr "verifiera inte paketsignatur(er)" @@ -1338,7 +1338,7 @@ msgstr "Internt fel" msgid "Archive file not in header" msgstr "Ingen arkivfilen i huvud" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr " misslyckades - " @@ -1347,47 +1347,47 @@ msgstr " misslyckades - " msgid "package %s was already added, replacing with %s\n" msgstr "paket %s är redan tillagt, ersätter med %s\n" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "(cachad)" -#: lib/depends.c:421 +#: lib/depends.c:424 msgid "(rpmrc provides)" msgstr "(rpmrc tillhandahåller)" -#: lib/depends.c:438 +#: lib/depends.c:441 msgid "(rpmlib provides)" msgstr "(rpmlib tillhandahåller)" -#: lib/depends.c:467 +#: lib/depends.c:470 msgid "(db files)" msgstr "(db-filer)" -#: lib/depends.c:480 +#: lib/depends.c:483 msgid "(db provides)" msgstr "(db tillhandahåller)" -#: lib/depends.c:493 +#: lib/depends.c:496 msgid "(db package)" msgstr "(db-paket)" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "ignorera paketnamnsrelation(er) [%d]\t%s -> %s\n" -#: lib/depends.c:969 +#: lib/depends.c:972 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tar bort %s \"%s\" från tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1395,27 +1395,27 @@ msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, träd, " "djup)\n" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== endast efterföljare (%d byte)\n" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "rpmtsOrder misslyckades, %d element återstår\n" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(inte ett tal)" @@ -1427,89 +1427,90 @@ msgstr "(inte base64)" msgid "(invalid type)" msgstr "(felaktig typ)" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 msgid "(not a blob)" msgstr "(inte en klick)" -#: lib/formats.c:324 +#: lib/formats.c:338 #, fuzzy msgid "(invalid xml type)" msgstr "(felaktig typ)" -#: lib/formats.c:401 +#: lib/formats.c:423 msgid "(not an OpenPGP signature)" msgstr "(inte en OpenPGP-signatur)" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() kunde inte returnera storlek: %s\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() kunde inte returnera monteringspunkter: %s\n" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "kunde inte ta status på %s: %s\n" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: lib/fs.c:213 +#: lib/fs.c:216 #, c-format msgid "%5d 0x%04x %s %s\n" msgstr "%5d 0x%04x %s %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "filen %s är på en okänd enhet\n" -#: lib/fsm.c:341 -msgid "========== Directories not explictly included in package:\n" +#: lib/fsm.c:350 +#, fuzzy +msgid "========== Directories not explicitly included in package:\n" msgstr "========== Kataloger ej uttryckligen inkluderade i paketet:\n" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, c-format msgid "%10d %s\n" msgstr "%10d %s\n" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "katalog %s skapad med rättigheter %04o.\n" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "arkivfil %s fanns inte i huvudets fillista\n" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "%s sparades som %s\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir av %s misslyckades: Katalogen är inte tom\n" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir av %s misslyckades: %s\n" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink av %s misslyckades: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "%s skapades som %s\n" @@ -1524,7 +1525,7 @@ msgstr "kan inte skapa %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "kan inte skriva till %%%s %s\n" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "fel när tämporärfil %s skapades\n" @@ -1562,173 +1563,173 @@ msgstr "hvd SHA1: FEL, ej hex\n" msgid "hdr DSA: BAD, not binary\n" msgstr "hvd DSA: FEL, ej binär\n" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "endast V3-signaturer kan verifieras, hoppar över V%u-signatur\n" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "hvdstorlek(%d): FEL, läsning returnerade %d\n" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "hvdmagi: FEL\n" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "hvdtaggar: FEL, antal taggar(%d) utanför intervall\n" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "hvddata: FEL, antal byte(%d) utanför intervall\n" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "hvdklick(%d): FEL, läsning returnerade %d\n" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "hvdlast: FEL\n" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM\n" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: rpmReadSignature misslyckades: %s" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen signatur tillgänglig\n" -#: lib/package.c:843 +#: lib/package.c:852 #, c-format msgid "%s: headerRead failed: %s" msgstr "%s: headerRead misslyckades: %s" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread misslyckades: %s\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "fördefiniera MAKRO till värdet UTTR" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "'MAKRO UTTR'" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "definiera MAKRO till värdet UTTR" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 msgid "print macro expansion of EXPR" msgstr "skriv ut makroexpansion av UTTR" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "'UTTR'" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 msgid "read <FILE:...> instead of default file(s)" msgstr "läs <FIL:...> istället för standardfil(er)" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "<FIL:...>" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "inaktivera användningen av libio(3)-API:et" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 msgid "send stdout to CMD" msgstr "skicka standard ut till KMD" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "KMD" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 msgid "use ROOT as top level directory" msgstr "använd ROT som toppnivåkatalog" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "ROT" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "visa kända frågetaggar" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "visa slutliga rpmrc- och makrokonfigurationer" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "visa mindre detaljerad utdata" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "visa mer detaljerad utdata" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "visa vilken version av rpm som används" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 msgid "debug payload file state machine" msgstr "felsök lastfilstillståndsmaskin" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "felsök lastfilstillståndsmaskin" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "felsök protokolldataström" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 msgid "debug option/argument processing" msgstr "felsök flagg-/argumenthantering" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 msgid "debug package state machine" msgstr "felsök pakettillståndsmaskin" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "felsök pakettillståndsmaskin" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "felsök rpmio I/O" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "felsök cache-hanteringen av URL:ar" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "%s: flaggtabell felkonfigurerad (%d)\n" @@ -2146,90 +2147,90 @@ msgstr "signera paket (detsamma som --addsign)" msgid "generate signature" msgstr "generera signatur" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:470 -#, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +#: lib/psm.c:480 +#, fuzzy, c-format +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "%s: waitpid(%d) rk %d status %x\n" # Avslutande %s blir sökvägen till ldconfig. Det är en körning av # programmet man hoppar över. Alltså: överflödig körning. -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "%s: %s(%s-%s-%s) hoppar över överflödig \"%s\".\n" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "%s: %s(%s-%s-%s) start %ssynkront skript\n" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" -#: lib/psm.c:741 +#: lib/psm.c:756 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "%s(%s-%s-%s) skript misslyckades, waitpid(%d) rk %d: %s\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "%s(%s-%s-%s) skript misslyckades, slutstatus %d\n" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s har %d filer, test = %d\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s-skript misslyckades (%d), hoppar över %s\n" -#: lib/psm.c:1418 +#: lib/psm.c:1439 msgid "Unable to reload signature header\n" msgstr "Kan inte läsa om signaturhuvud\n" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr " vid fil " -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "fel format: %s\n" @@ -2277,7 +2278,7 @@ msgid "package has neither file owner or id lists\n" msgstr "paketet har varken filägare eller id-listor\n" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2292,71 +2293,76 @@ msgstr "fråga av %s misslyckades\n" msgid "old format source packages cannot be queried\n" msgstr "källpaket i gammalt format går inte att fråga om\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "%s: inte ett rpm-paket (eller paketspecifikation): %s\n" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "inga paket\n" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "okänd tagg" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupp %s innehåller inga paket\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "inga paketutlösare %s\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, c-format msgid "malformed %s: %s\n" msgstr "felformaterad %s: %s\n" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, c-format msgid "no package matches %s: %s\n" msgstr "inga paket matchar %s: %s\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "inget paket behöver %s\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "inget paket tillhandahåller %s\n" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "fil %s: %s\n" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "filen %s tillhör inget paket\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "felaktigt paketnummer: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "paketpost nummer: %u\n" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "post %u kunde inte läsas\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -2378,99 +2384,99 @@ msgstr "%s: open misslyckades: %s\n" msgid "makeTempFile failed\n" msgstr "makeTempFile misslyckades\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite misslyckades: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, c-format msgid "%s: not an rpm package\n" msgstr "%s: inte ett rpm-paket\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Kan inte signera v1-paketering\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Kan inte signera om v2-paketering\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "%s: var redan signerad av nyckel-ID %s, hoppar över\n" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead misslyckades: %s\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature misslyckades: %s\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, c-format msgid "%s: import read failed.\n" msgstr "%s: importläsning misslyckades.\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, c-format msgid "%s: import failed.\n" msgstr "%s: import misslyckades.\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, c-format msgid "%s: headerRead failed\n" msgstr "%s: headerRead misslyckades\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: headerGetEntry misslyckades\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "EJ OK" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr " (SAKNADE NYCKLAR:" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr " (EJ BETRODDA NYCKLAR:" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "OK" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "NEJ " -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "JA" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2479,42 +2485,47 @@ msgstr "" "\"B\"-beroendet behöver en epok (antar samma epok som \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s har ouppfyllda %s: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "%s överhoppad på grund av missingok-flagga\n" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "========== omflyttningar\n" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, c-format msgid "%5d exclude %s\n" msgstr "%5d utesluter %s\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d flyttar om %s -> %s\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "hoppar över %s %s\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "flyttar %s till %s\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "flyttar katalogen %s till %s\n" @@ -2565,7 +2576,7 @@ msgstr " ... som %s\n" msgid "skipping %s - transfer failed - %s\n" msgstr "hoppar över %s - överföring misslyckades - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" @@ -2585,50 +2596,50 @@ msgstr "fel vid läsning från fil %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "filen %s behöver en nyare version av RPM\n" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "hittade %d käll- och %d binärpaket\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 msgid "Failed dependencies:\n" msgstr "Ouppfyllda beroenden:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr " Föreslagna lösningar:\n" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "installerar binärpaket\n" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan inte öppna filen %s: %s\n" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "Återställer paket (+%d/-%d) till %-24.24s (0x%08x):\n" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "läsning misslyckades: %s (%d)\n" @@ -2838,35 +2849,50 @@ msgstr "Kan inte läsa %s, HOME är för stor.\n" msgid "Unable to open %s for reading: %s.\n" msgstr "Kan inte öppna %s för läsning: %s.\n" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "felaktigt paketnummer: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "\"(\" saknas i %s %s\n" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "felaktigt paketnummer: %s\n" + +#: lib/rpmts.c:448 #, c-format msgid "cannot open Solve database in %s\n" msgstr "kan inte öppna Solve-databas i %s\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, c-format msgid "Adding: %s\n" msgstr "Lägger till: %s\n" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, c-format msgid "Suggesting: %s\n" msgstr "Föreslår %s\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 msgid "mounted filesystems:\n" msgstr "monterade filsystem:\n" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr " i enhet bstrl btillg itillg monteringspunkt\n" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "%5d 0x%04x %5u %12ld %12ld %s\n" @@ -2999,46 +3025,41 @@ msgstr "Du måste sätta \"%%_pgp_name\" i din makrofil\n" msgid "Header+Payload size: " msgstr "Huvud+laststorlek: " -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "MD5-summa: " -#: lib/signature.c:1071 +#: lib/signature.c:1075 msgid "Header SHA1 digest: " msgstr "Huvudets SHA1-summa: " -#: lib/signature.c:1146 +#: lib/signature.c:1152 msgid "V3 RSA/MD5 signature: " msgstr "V3 RSA/MD5-signatur: " -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "Huvud " -#: lib/signature.c:1264 +#: lib/signature.c:1274 msgid "V3 DSA signature: " msgstr "V3 DSA-signatur: " -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "Verifiera signatur: FELAKTIGA PARAMETRAR\n" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "Trasig MD5-summa: STÖDS EJ\n" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: OKÄND (%d)\n" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "%s överhoppad på grund av missingok-flagga\n" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" @@ -3051,7 +3072,7 @@ msgstr "hoppar över katalogen %s\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "rimlighetskontrollerar %d element\n" @@ -3064,7 +3085,7 @@ msgstr "rimlighetskontrollerar %d element\n" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "beräknar %d filfingeravtryck\n" @@ -3072,16 +3093,16 @@ msgstr "beräknar %d filfingeravtryck\n" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "beräknar filåtgärder\n" -#: lib/verify.c:285 +#: lib/verify.c:288 #, c-format msgid "missing %c %s" msgstr "saknas %c %s" -#: lib/verify.c:394 +#: lib/verify.c:397 #, c-format msgid "Unsatisfied dependencies for %s: " msgstr "Ouppfyllda beroenden för %s: " @@ -3170,71 +3191,80 @@ msgstr "%s har för stort eller för litet \"long\"-värde, hoppar över\n" msgid "%s has too large or too small integer value, skipped\n" msgstr "%s har för stort eller för litet heltalsvärde, hoppar över\n" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "{ saknas efter %" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "} saknas efter %{" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "tomt taggformat" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "tomt taggnamn" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "okänd tagg" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "] förväntades vid slutet på vektor" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "oväntad ]" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "oväntad }" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "? förväntades i uttryck" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "{ förväntades efter ? i uttryck" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "} förväntades i uttryck" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr ": förväntades efter ? i deluttryck" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "{ förväntades efter : i uttryck" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "| förväntades vid slutet på uttryck" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "(index utanför intervall)" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "vektoriterator använd med vektor av annan storlek" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3256,176 +3286,176 @@ msgstr "verifiera databasfiler" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generera huvuden kompatibla med (äldre) rpm[23]-paketering" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: okänt taggnamn: \"%s\" ignorerat\n" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kan inte öppna %s-indexet med db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, c-format msgid "cannot open %s index\n" msgstr "kan inte öppna %s-indexet\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "ingen dbpath har satts\n" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "fel(%d) när \"%s\"-poster hämtades från %s-indexet\n" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: hoppar över" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "fel(%d) när post nr. %d sparades i %s\n" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: hoppar över" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: skadat huvud nr. %u hämtat -- hoppar över.\n" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan inte läsa huvud vid 0x%x\n" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "fel(%d) när huvudpost nr. %d för %s skulle tas bort\n" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "tar bort %d poster från %s-indexet.\n" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "fel(%d) när \"%s\"-poster från %s-indexet sattes\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "fel(%d) när post \"%s\" sparades i %s\n" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "fel(%d) när post \"%s\" togs bort från %s\n" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fel(%d) vid allokering av ny paketinstans\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 msgid "rpmdbAdd: skipping" msgstr "rpmdbAdd: hoppar över" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "lägger till \"%s\" till %s-indexet.\n" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "lägger till %d poster till %s-indexet.\n" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "fel(%d) när post %s sparades i %s\n" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "tar bort %s efter lyckad db3-ombyggnad.\n" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "tillfällig databas %s existerar redan\n" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "skapar katalog %s\n" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "skapar katalog %s: %s\n" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "öppnar gammal databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "huvud nr. %u i databasen är felaktigt -- hoppar över.\n" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "kan inte lägga till post ursprungligen vid %u\n" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "byt ut filer i %s med filer från %s för att återställa" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" @@ -3436,144 +3466,144 @@ msgid "======================== active %d empty %d\n" msgstr "======================== aktiva %d tomma %d\n" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(tom)" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(tom)\n" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s har oavslutad kropp\n" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s har otillåtet namn (%%define)\n" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s har oavslutade flaggor\n" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "makro %%%s har tom kropp\n" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makro %%%s misslyckades att expandera\n" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s har otillåtet namn (%%undefine)\n" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) användes inte under nivå %d\n" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Okänd flagga %c i %s(%s)\n" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Rekursionsdjup(%d) större än max(%d)\n" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "Oavslutad %c: %s\n" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Ett %% följs av ett makro som inte kan tolkas\n" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Inget makro %%%.*s hittat, hoppar över\n" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "Målbuffert översvämmad\n" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "Fil %s: %s\n" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Filen %s är mindre än %u byte\n" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "Lyckades" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "Konstigt svar från server" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "IO-fel mot server" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "Förbindelsen med servern dog ut (timeout)" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "Kunde inte slå upp serverns adress" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "Kunde inte slå upp serverns namn" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "Misslyckades med att kontakta servern" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "Misslyckades med att etablera en dataförbindelse till servern" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "I/O-fel mot lokal fil" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "Fel när fjärrservern sattes i passivt läge" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "Filen fanns inte på servern" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "Avbruten under gång" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "Okänt eller oväntat fel" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "loggar in på %s som %s, lösenord %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-03-19 17:51-0500\n" +"POT-Creation-Date: 2003-08-26 15:43-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -110,7 +110,7 @@ msgstr "Tüm rpm kipleri için ortak seçenekler:" msgid "%s: %s\n" msgstr "dosya %s: %s\n" -#: rpmqv.c:129 lib/poptALL.c:104 +#: rpmqv.c:129 lib/poptALL.c:111 #, c-format msgid "RPM version %s\n" msgstr "RPM Sürüm %s\n" @@ -349,27 +349,27 @@ msgstr "denetleme için hiç argüman belirtilmedi" msgid "no arguments given" msgstr "sorgulama için hiç argüman belirtilmedi" -#: build/build.c:130 build/pack.c:497 +#: build/build.c:132 build/pack.c:497 msgid "Unable to open temp file.\n" msgstr "Geçici dosya açýlamadý.\n" -#: build/build.c:218 +#: build/build.c:220 #, c-format msgid "Executing(%s): %s\n" msgstr "%s icra ediliyor: %s\n" #. @=boundsread@ -#: build/build.c:228 +#: build/build.c:230 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "%s 'in icrasý baþarýsýz (%s): %s\n" -#: build/build.c:237 +#: build/build.c:239 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "%s çýkýþýnda hata (%s)\n" -#: build/build.c:343 +#: build/build.c:345 msgid "" "\n" "\n" @@ -379,244 +379,244 @@ msgstr "" "\n" "RPM derleme hatalarý:\n" -#: build/expression.c:225 +#: build/expression.c:228 msgid "syntax error while parsing ==\n" msgstr "== çözümlenirken sözdizimi hatasý bulundu\n" -#: build/expression.c:255 +#: build/expression.c:258 msgid "syntax error while parsing &&\n" msgstr "&& çözümlenirken sözdizimi hatasý bulundu\n" -#: build/expression.c:264 +#: build/expression.c:267 msgid "syntax error while parsing ||\n" msgstr "|| çözümlenirken sözdizimi hatasý bulundu\n" -#: build/expression.c:307 +#: build/expression.c:310 msgid "parse error in expression\n" msgstr "ifadede çözümleme hatasý\n" -#: build/expression.c:347 +#: build/expression.c:352 msgid "unmatched (\n" msgstr "uyumsuz (\n" -#: build/expression.c:377 +#: build/expression.c:382 msgid "- only on numbers\n" msgstr "- sadece sayýlarda\n" -#: build/expression.c:393 +#: build/expression.c:398 msgid "! only on numbers\n" msgstr "! sadece sayýlarda\n" -#: build/expression.c:440 build/expression.c:494 build/expression.c:558 -#: build/expression.c:655 +#: build/expression.c:446 build/expression.c:501 build/expression.c:566 +#: build/expression.c:663 msgid "types must match\n" msgstr "türler eþleþmeli\n" -#: build/expression.c:453 +#: build/expression.c:459 msgid "* / not suported for strings\n" msgstr "* / dizgelerde desteklenmez\n" -#: build/expression.c:510 +#: build/expression.c:517 msgid "- not suported for strings\n" msgstr "- dizgelerde desteklenmez\n" -#: build/expression.c:668 +#: build/expression.c:676 msgid "&& and || not suported for strings\n" msgstr "&& ve || dizgelerde desteklenmez\n" -#: build/expression.c:702 build/expression.c:751 +#: build/expression.c:710 build/expression.c:759 msgid "syntax error in expression\n" msgstr "ifadede sözdizimi hatasý\n" -#: build/files.c:294 +#: build/files.c:278 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK baþarýsýz: %s\n" -#: build/files.c:359 build/files.c:559 build/files.c:755 +#: build/files.c:343 build/files.c:543 build/files.c:739 #, c-format msgid "Missing '(' in %s %s\n" msgstr "%s içinde '(' yok: %s\n" -#: build/files.c:370 build/files.c:689 build/files.c:766 +#: build/files.c:354 build/files.c:673 build/files.c:750 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "%s içinde ')' yok: (%s\n" -#: build/files.c:408 build/files.c:714 +#: build/files.c:392 build/files.c:698 #, c-format msgid "Invalid %s token: %s\n" msgstr "Andaç %s geçersiz: %s\n" -#: build/files.c:518 +#: build/files.c:502 #, fuzzy, c-format msgid "Missing %s in %s %s\n" msgstr "%s içinde '(' yok: %s\n" -#: build/files.c:575 +#: build/files.c:559 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "%s() boþluksuz yazýlmýþ: %s\n" -#: build/files.c:613 +#: build/files.c:597 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "Sözdizimi hatasý: %s(%s)\n" -#: build/files.c:623 +#: build/files.c:607 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "mode spec hatalý: %s(%s)\n" -#: build/files.c:635 +#: build/files.c:619 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "dirmode spec hatalý: %s(%s)\n" -#: build/files.c:793 +#: build/files.c:777 #, c-format msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "yerel uzunluðu hatalý: \"%.*s\" (%%lang(%s))\n" #. @innercontinue@ -#: build/files.c:804 +#: build/files.c:788 #, c-format msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "%.*s yereli %%lang(%s) içinde tekrarlanmýþ\n" -#: build/files.c:933 +#: build/files.c:917 #, c-format msgid "Hit limit for %%docdir\n" msgstr "%%docdir için hit sýnýrý\n" -#: build/files.c:939 +#: build/files.c:925 #, c-format msgid "Only one arg for %%docdir\n" msgstr "%%docdir için sadece tek argüman\n" #. We already got a file -- error -#: build/files.c:970 +#: build/files.c:959 #, c-format msgid "Two files on one line: %s\n" msgstr "Bir satýrda 2 dosya: %s\n" -#: build/files.c:987 +#: build/files.c:976 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "Dosya \"/\" ile baþlamalý: %s\n" -#: build/files.c:1000 +#: build/files.c:989 #, c-format msgid "Can't mix special %%doc with other forms: %s\n" msgstr "Özel %%doc ile diðer formlar karýþtýrýlamaz: %s\n" -#: build/files.c:1152 +#: build/files.c:1141 #, c-format msgid "File listed twice: %s\n" msgstr "Dosya iki kere gösterildi: %s\n" -#: build/files.c:1291 +#: build/files.c:1280 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Sembolik bað BuildRoot gösteriyor: %s -> %s\n" -#: build/files.c:1531 +#: build/files.c:1520 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Dosya önek (%s) ile uyumsuz: %s\n" -#: build/files.c:1555 +#: build/files.c:1544 #, c-format msgid "File not found: %s\n" msgstr "Dosya bulunamadý: %s\n" -#: build/files.c:1763 +#: build/files.c:1752 #, fuzzy, c-format msgid "%s: public key read failed.\n" msgstr "%s: readLead baþarýsýz\n" -#: build/files.c:1767 lib/rpmchecksig.c:572 +#: build/files.c:1756 lib/rpmchecksig.c:580 #, c-format msgid "%s: not an armored public key.\n" msgstr "" -#: build/files.c:1815 +#: build/files.c:1804 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Dosya \"/\" ile içermeli: %s\n" -#: build/files.c:1839 +#: build/files.c:1828 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "satýr %d: Dosya adý uygun deðil: %s\n" -#: build/files.c:1856 lib/rpminstall.c:347 +#: build/files.c:1845 lib/rpminstall.c:347 #, c-format msgid "File not found by glob: %s\n" msgstr "Dosya glob tarafýndan bulunamadý: %s\n" -#: build/files.c:1916 +#: build/files.c:1905 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%%files dosya %s dosyasýnda açýlamadý: %s\n" -#: build/files.c:1927 build/pack.c:156 +#: build/files.c:1916 build/pack.c:156 #, c-format msgid "line: %s\n" msgstr "satýr: %s\n" -#: build/files.c:2318 +#: build/files.c:2307 #, c-format msgid "Bad file: %s: %s\n" msgstr "Dosya hatalý: %s: %s\n" -#: build/files.c:2330 build/parsePrep.c:50 +#: build/files.c:2319 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Kullanýcý/grup hatalý: %s\n" -#: build/files.c:2374 +#: build/files.c:2363 #, fuzzy, c-format msgid "Checking for unpackaged file(s): %s\n" msgstr "arþiv paketi açýlýrken baþarýsýz%s%s: %s\n" -#: build/files.c:2397 +#: build/files.c:2386 #, c-format msgid "" "Installed (but unpackaged) file(s) found:\n" "%s" msgstr "" -#: build/files.c:2425 +#: build/files.c:2414 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Ýþlenen dosyalar: %s-%s-%s\n" -#: build/names.c:54 +#: build/names.c:56 msgid "getUname: too many uid's\n" msgstr "getUname: çok fazla kullanýcý-kimliði\n" -#: build/names.c:78 +#: build/names.c:82 msgid "getUnameS: too many uid's\n" msgstr "getUnameS: çok fazla kullanýcý-kimliði\n" -#: build/names.c:102 +#: build/names.c:111 msgid "getUidS: too many uid's\n" msgstr "getUidS: çok fazla kullanýcý-kimliði\n" -#: build/names.c:126 +#: build/names.c:140 msgid "getGname: too many gid's\n" msgstr "getGname: çok fazla grup-kimliði\n" -#: build/names.c:150 +#: build/names.c:166 msgid "getGnameS: too many gid's\n" msgstr "getGnameS: çok fazla grup-kimliði\n" -#: build/names.c:174 +#: build/names.c:195 msgid "getGidS: too many gid's\n" msgstr "getGidS: çok fazla grup-kimliði\n" -#: build/names.c:213 +#: build/names.c:237 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "Böyle bir makina yok: %s\n" @@ -730,7 +730,7 @@ msgstr "%s'den baþlýk okunamadý: %s\n" msgid "Could not open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: build/pack.c:632 lib/psm.c:1406 +#: build/pack.c:632 lib/psm.c:1427 #, c-format msgid "Unable to write package: %s\n" msgstr "paket yazýlamadý: %s\n" @@ -760,7 +760,7 @@ msgstr "%s'den payload okunamadý: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "%s'e payload yazýlamadý: %s\n" -#: build/pack.c:725 lib/psm.c:1696 +#: build/pack.c:725 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" @@ -820,17 +820,17 @@ msgstr "satýr %d: %%description ayrýþtýrýlýrken hata: %s \n" msgid "line %d: Bad option %s: %s\n" msgstr "satýr %d: %s seçeneði hatalý: %s\n" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:214 +#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214 #, c-format msgid "line %d: Too many names: %s\n" msgstr "satýr %d: Ýsim sayýsý fazla: %s\n" -#: build/parseDescription.c:85 build/parseFiles.c:79 build/parseScript.c:223 +#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "satýr %d: Paket yok: %s\n" -#: build/parseDescription.c:97 +#: build/parseDescription.c:89 #, c-format msgid "line %d: Second description\n" msgstr "satýr %d: Ýkinci açýklama\n" @@ -911,7 +911,7 @@ msgstr "satýr %d: Etiket boþ: %s\n" msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "satýr %d: %s içinde '-' karakteri kuraldýþý: %s\n" -#: build/parsePreamble.c:588 build/parseSpec.c:427 +#: build/parsePreamble.c:588 build/parseSpec.c:429 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "BuildRoot \"/\" olamaz: %s\n" @@ -1093,31 +1093,31 @@ msgstr "%s açýlamadý: %s\n" msgid "Unclosed %%if\n" msgstr "%%if kapanmamýþ\n" -#: build/parseSpec.c:301 +#: build/parseSpec.c:303 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "%s:%d: parseExpressionBoolean %d ile döner\n" -#: build/parseSpec.c:310 +#: build/parseSpec.c:312 #, c-format msgid "%s:%d: Got a %%else with no %%if\n" msgstr "%s:%d: %%if'siz bir %%else alýndý\n" -#: build/parseSpec.c:322 +#: build/parseSpec.c:324 #, c-format msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "%s:%d: %%if'siz bir %%endif alýndý\n" -#: build/parseSpec.c:336 build/parseSpec.c:345 +#: build/parseSpec.c:338 build/parseSpec.c:347 #, c-format msgid "malformed %%include statement\n" msgstr "%%include deyimi bozuk\n" -#: build/parseSpec.c:546 +#: build/parseSpec.c:548 msgid "No compatible architectures found for build\n" msgstr "Kurgulamak için uyumlu mimari yok\n" -#: build/parseSpec.c:607 +#: build/parseSpec.c:609 #, c-format msgid "Package has no %%description: %s\n" msgstr "Paket %%description içermiyor: %s\n" @@ -1256,19 +1256,19 @@ msgstr "paket baðýmlýlýklarýný denetlemez" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "paket baþlýklarýný (eski) rpm[23] paketleme ile uyumlu üretir" -#: build/poptBT.c:229 lib/poptALL.c:225 lib/poptI.c:254 lib/poptQV.c:329 +#: build/poptBT.c:229 lib/poptALL.c:232 lib/poptI.c:254 lib/poptQV.c:329 #: lib/poptQV.c:338 lib/poptQV.c:377 #, fuzzy msgid "don't verify package digest(s)" msgstr "paket baðýmlýlýklarý doðrulanmaz" -#: build/poptBT.c:231 lib/poptALL.c:227 lib/poptI.c:256 lib/poptQV.c:332 +#: build/poptBT.c:231 lib/poptALL.c:234 lib/poptI.c:256 lib/poptQV.c:332 #: lib/poptQV.c:340 lib/poptQV.c:380 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "paket mimarisi denetlenmez" -#: build/poptBT.c:233 lib/poptALL.c:233 lib/poptI.c:258 lib/poptQV.c:335 +#: build/poptBT.c:233 lib/poptALL.c:240 lib/poptI.c:258 lib/poptQV.c:335 #: lib/poptQV.c:342 lib/poptQV.c:382 #, fuzzy msgid "don't verify package signature(s)" @@ -1364,7 +1364,7 @@ msgstr "Ýç hata" msgid "Archive file not in header" msgstr "" -#: lib/cpio.c:248 +#: lib/cpio.c:250 msgid " failed - " msgstr " baþarýsýz - " @@ -1373,52 +1373,52 @@ msgstr " baþarýsýz - " msgid "package %s was already added, replacing with %s\n" msgstr "%s zaten kurulu" -#: lib/depends.c:394 +#: lib/depends.c:397 msgid "(cached)" msgstr "" -#: lib/depends.c:421 +#: lib/depends.c:424 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:438 +#: lib/depends.c:441 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:467 +#: lib/depends.c:470 #, fuzzy msgid "(db files)" msgstr "db dosyasý %s hatalý\n" -#: lib/depends.c:480 +#: lib/depends.c:483 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:493 +#: lib/depends.c:496 #, fuzzy msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:847 +#: lib/depends.c:851 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:972 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort baðýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n" #. Record all relations. -#: lib/depends.c:1200 +#: lib/depends.c:1204 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1292 +#: lib/depends.c:1296 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1426,27 +1426,27 @@ msgid "" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1377 +#: lib/depends.c:1381 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1447 +#: lib/depends.c:1451 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1482 +#: lib/depends.c:1486 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1487 +#: lib/depends.c:1491 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" -#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:477 -#: rpmdb/header.c:3524 rpmdb/header.c:3553 rpmdb/header.c:3577 +#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499 +#: rpmdb/header.c:3509 rpmdb/header.c:3538 rpmdb/header.c:3562 msgid "(not a number)" msgstr "(bir sayý deðil)" @@ -1459,91 +1459,91 @@ msgstr "(bir sayý deðil)" msgid "(invalid type)" msgstr "" -#: lib/formats.c:206 lib/formats.c:376 +#: lib/formats.c:206 lib/formats.c:398 #, fuzzy msgid "(not a blob)" msgstr "(bir sayý deðil)" -#: lib/formats.c:324 +#: lib/formats.c:338 msgid "(invalid xml type)" msgstr "" -#: lib/formats.c:401 +#: lib/formats.c:423 #, fuzzy msgid "(not an OpenPGP signature)" msgstr "tüm PGP imzalarýný atlar" -#: lib/fs.c:74 +#: lib/fs.c:77 #, c-format msgid "mntctl() failed to return size: %s\n" msgstr "mntctl() sonuçlanan hatalý boyut nedeniyle baþarýsýz: %s\n" -#: lib/fs.c:89 +#: lib/fs.c:92 #, c-format msgid "mntctl() failed to return mount points: %s\n" msgstr "mntctl() sonuçlanan hatalý baðlantý yerleri nedeniyle baþarýsýz: %s\n" -#: lib/fs.c:109 lib/fs.c:196 lib/fs.c:313 +#: lib/fs.c:112 lib/fs.c:199 lib/fs.c:318 #, c-format msgid "failed to stat %s: %s\n" msgstr "stat %s baþarýsýz: %s\n" -#: lib/fs.c:154 rpmio/url.c:523 +#: lib/fs.c:157 rpmio/url.c:523 #, c-format msgid "failed to open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/fs.c:213 +#: lib/fs.c:216 #, fuzzy, c-format msgid "%5d 0x%04x %s %s\n" msgstr "Dosya %4d: %07o %s.%s\t %s\n" -#: lib/fs.c:336 +#: lib/fs.c:341 #, c-format msgid "file %s is on an unknown device\n" msgstr "%s dosyasýnýn bulunduðu aygýt anlaþýlamadý\n" -#: lib/fsm.c:341 +#: lib/fsm.c:350 #, fuzzy -msgid "========== Directories not explictly included in package:\n" +msgid "========== Directories not explicitly included in package:\n" msgstr "========= Pakette bulunmayan dizinler:\n" -#: lib/fsm.c:343 +#: lib/fsm.c:352 #, fuzzy, c-format msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1261 +#: lib/fsm.c:1293 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%s dizin %04o izinleriyle oluþturuldu.\n" -#: lib/fsm.c:1559 +#: lib/fsm.c:1592 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1686 lib/fsm.c:1820 +#: lib/fsm.c:1719 lib/fsm.c:1855 #, c-format msgid "%s saved as %s\n" msgstr "%s %s olarak kaydedildi\n" -#: lib/fsm.c:1846 +#: lib/fsm.c:1882 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s / %s dizin silinemedi - Dizin boþ deðil\n" -#: lib/fsm.c:1852 +#: lib/fsm.c:1888 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s / %s dizinin silinmesi baþarýsýz: %s\n" -#: lib/fsm.c:1862 +#: lib/fsm.c:1903 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s / %s bað kaldýrýlamadý: %s\n" -#: lib/fsm.c:1882 +#: lib/fsm.c:1925 #, c-format msgid "%s created as %s\n" msgstr "%s %s olarak oluþturuldu\n" @@ -1558,7 +1558,7 @@ msgstr "%%%s dosyasý oluþturulamýyor: %s\n" msgid "cannot write to %%%s %s\n" msgstr "%%%s dosyasýna yazýlamaz %s\n" -#: lib/misc.c:187 lib/misc.c:192 lib/misc.c:198 +#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200 #, c-format msgid "error creating temporary file %s\n" msgstr "%s geçici dosyasý oluþturulurken hata\n" @@ -1596,182 +1596,182 @@ msgstr "" msgid "hdr DSA: BAD, not binary\n" msgstr "" -#: lib/package.c:535 lib/package.c:575 lib/package.c:879 lib/package.c:903 -#: lib/package.c:933 lib/rpmchecksig.c:805 +#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912 +#: lib/package.c:942 lib/rpmchecksig.c:813 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature\n" msgstr "" -#: lib/package.c:657 +#: lib/package.c:661 #, c-format msgid "hdr size(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:661 +#: lib/package.c:665 msgid "hdr magic: BAD\n" msgstr "" -#: lib/package.c:669 +#: lib/package.c:673 #, c-format msgid "hdr tags: BAD, no. of tags(%d) out of range\n" msgstr "" -#: lib/package.c:678 +#: lib/package.c:682 #, c-format msgid "hdr data: BAD, no. of bytes(%d) out of range\n" msgstr "" -#: lib/package.c:692 +#: lib/package.c:696 #, c-format msgid "hdr blob(%d): BAD, read returned %d\n" msgstr "" -#: lib/package.c:705 +#: lib/package.c:709 msgid "hdr load: BAD\n" msgstr "" -#: lib/package.c:770 +#: lib/package.c:777 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "RPM'nin bu sürümünde paket sürümü 1 desteklenmiyor\n" -#: lib/package.c:778 +#: lib/package.c:786 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "RPM'nin bu sürümünde sadece ilk sürüm rakamý <= 4 olan paketler " "destekleniyor\n" -#: lib/package.c:789 lib/rpmchecksig.c:229 lib/rpmchecksig.c:720 +#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728 #, fuzzy, c-format msgid "%s: rpmReadSignature failed: %s" msgstr "%s: rpmReadSignature baþarýsýz\n" -#: lib/package.c:796 lib/rpmchecksig.c:236 lib/rpmchecksig.c:728 +#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ýmza bulundurmuyor\n" -#: lib/package.c:843 +#: lib/package.c:852 #, fuzzy, c-format msgid "%s: headerRead failed: %s" msgstr "%s: readLead baþarýsýz\n" -#: lib/package.c:946 lib/rpmchecksig.c:117 lib/rpmchecksig.c:643 +#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread baþarýsýz: %s\n" -#: lib/poptALL.c:212 +#: lib/poptALL.c:219 msgid "predefine MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:213 lib/poptALL.c:216 +#: lib/poptALL.c:220 lib/poptALL.c:223 msgid "'MACRO EXPR'" msgstr "" -#: lib/poptALL.c:215 +#: lib/poptALL.c:222 msgid "define MACRO with value EXPR" msgstr "" -#: lib/poptALL.c:218 +#: lib/poptALL.c:225 #, fuzzy msgid "print macro expansion of EXPR" msgstr "<ifade>+ için makro açýlýmýný gösterir" -#: lib/poptALL.c:219 +#: lib/poptALL.c:226 msgid "'EXPR'" msgstr "" -#: lib/poptALL.c:221 lib/poptALL.c:240 lib/poptALL.c:244 +#: lib/poptALL.c:228 lib/poptALL.c:247 lib/poptALL.c:251 #, fuzzy msgid "read <FILE:...> instead of default file(s)" msgstr "öntanýmlý makro dosyasý yerine <dosya:...> okunur" -#: lib/poptALL.c:222 lib/poptALL.c:241 lib/poptALL.c:245 +#: lib/poptALL.c:229 lib/poptALL.c:248 lib/poptALL.c:252 msgid "<FILE:...>" msgstr "" -#: lib/poptALL.c:230 lib/poptALL.c:264 +#: lib/poptALL.c:237 lib/poptALL.c:271 msgid "disable use of libio(3) API" msgstr "libio(3) API kullanýmýný iptal eder" -#: lib/poptALL.c:236 +#: lib/poptALL.c:243 #, fuzzy msgid "send stdout to CMD" msgstr "standart çýktýyý <KOMUT>'a gönderir" -#: lib/poptALL.c:237 +#: lib/poptALL.c:244 msgid "CMD" msgstr "" -#: lib/poptALL.c:248 +#: lib/poptALL.c:255 #, fuzzy msgid "use ROOT as top level directory" msgstr "Üst düzey dizin olarak <dizin> kullanýlýr" -#: lib/poptALL.c:249 +#: lib/poptALL.c:256 msgid "ROOT" msgstr "" -#: lib/poptALL.c:252 +#: lib/poptALL.c:259 msgid "display known query tags" msgstr "tanýmlanmýþ sorgulama etiketlerini gösterir" -#: lib/poptALL.c:254 +#: lib/poptALL.c:261 msgid "display final rpmrc and macro configuration" msgstr "son rpmrc ve makro yapýlandýrmasýný gösterir" -#: lib/poptALL.c:256 +#: lib/poptALL.c:263 msgid "provide less detailed output" msgstr "daha az ayrýntýlý çýktý saðlar" -#: lib/poptALL.c:258 +#: lib/poptALL.c:265 msgid "provide more detailed output" msgstr "daha ayrýntýlý çýktý saðlar" -#: lib/poptALL.c:260 +#: lib/poptALL.c:267 msgid "print the version of rpm being used" msgstr "Kullanýlan RPM sürümünü verir" -#: lib/poptALL.c:273 +#: lib/poptALL.c:280 #, fuzzy msgid "debug payload file state machine" msgstr "hata ayýklama dosyasý durum motoru" -#: lib/poptALL.c:275 +#: lib/poptALL.c:282 #, fuzzy msgid "use threads for file state machine" msgstr "hata ayýklama dosyasý durum motoru" -#: lib/poptALL.c:277 +#: lib/poptALL.c:284 msgid "debug protocol data stream" msgstr "protokol veri akýþýnda hata kontrolu" -#: lib/poptALL.c:282 +#: lib/poptALL.c:289 #, fuzzy msgid "debug option/argument processing" msgstr "(%d) argümaný iþlenirken iç hata oluþtu :-(\n" -#: lib/poptALL.c:285 +#: lib/poptALL.c:292 #, fuzzy msgid "debug package state machine" msgstr "hata ayýklama dosyasý durum motoru" -#: lib/poptALL.c:287 +#: lib/poptALL.c:294 #, fuzzy msgid "use threads for package state machine" msgstr "hata ayýklama dosyasý durum motoru" -#: lib/poptALL.c:299 +#: lib/poptALL.c:306 msgid "debug rpmio I/O" msgstr "rpmio G/Ç hata kontrolu" -#: lib/poptALL.c:309 +#: lib/poptALL.c:318 msgid "debug URL cache handling" msgstr "URL arabellek kullanýmý hata kontrolu" #. @-nullpass@ -#: lib/poptALL.c:379 +#: lib/poptALL.c:388 #, c-format msgid "%s: option table misconfigured (%d)\n" msgstr "" @@ -2208,89 +2208,89 @@ msgstr "paketi imzalar (mevcut imza kaldýrýlýr)" msgid "generate signature" msgstr "imza üretir" -#: lib/psm.c:270 +#: lib/psm.c:269 msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n" -#: lib/psm.c:390 +#: lib/psm.c:394 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyasý içermiyor\n" -#: lib/psm.c:470 +#: lib/psm.c:480 #, c-format -msgid "%s: waitpid(%d) rc %d status %x\n" +msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n" msgstr "" -#: lib/psm.c:551 +#: lib/psm.c:562 #, c-format msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n" msgstr "" -#: lib/psm.c:559 +#: lib/psm.c:570 #, c-format msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n" msgstr "" -#: lib/psm.c:722 +#: lib/psm.c:735 #, c-format msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n" msgstr "" -#: lib/psm.c:741 +#: lib/psm.c:756 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n" msgstr "%s: %s betiði baþarýsýz (%d), %s-%s-%s atlanýyor\n" -#: lib/psm.c:747 +#: lib/psm.c:762 #, fuzzy, c-format msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n" msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, çýkýþta durum %d\n" -#: lib/psm.c:1170 +#: lib/psm.c:1191 #, fuzzy, c-format msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n" -#: lib/psm.c:1309 +#: lib/psm.c:1330 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s betiði baþarýsýz (%d), %s-%s-%s atlanýyor\n" -#: lib/psm.c:1418 +#: lib/psm.c:1439 #, fuzzy msgid "Unable to reload signature header\n" msgstr "%s'den baþlýk okunamadý: %s\n" -#: lib/psm.c:1464 +#: lib/psm.c:1485 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:1473 +#: lib/psm.c:1494 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:1521 +#: lib/psm.c:1546 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "arþiv paketi açýlýrken baþarýsýz%s%s: %s\n" -#: lib/psm.c:1522 +#: lib/psm.c:1547 msgid " on file " msgstr " dosyada " -#: lib/psm.c:1704 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:1707 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" -#: lib/query.c:118 lib/rpmts.c:451 +#: lib/query.c:118 lib/rpmts.c:558 #, c-format msgid "incorrect format: %s\n" msgstr "biçem yanlýþ: %s\n" @@ -2339,7 +2339,7 @@ msgid "package has neither file owner or id lists\n" msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n" #: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:462 -#: lib/rpminstall.c:593 lib/rpminstall.c:1004 lib/rpmts.c:462 +#: lib/rpminstall.c:593 lib/rpminstall.c:1018 lib/rpmts.c:569 #: tools/rpmgraph.c:120 tools/rpmgraph.c:157 #, c-format msgid "open of %s failed: %s\n" @@ -2354,71 +2354,76 @@ msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n" msgid "old format source packages cannot be queried\n" msgstr "eski biçem kaynak paketleri sorgulanamaz\n" -#: lib/query.c:486 lib/rpminstall.c:606 +#: lib/query.c:488 lib/rpminstall.c:608 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "%s tetikleyen paket yok\n" -#: lib/query.c:515 +#: lib/query.c:517 msgid "no packages\n" msgstr "paket yok\n" #: lib/query.c:535 +#, fuzzy, c-format +msgid "unknown tag: \"%s\"\n" +msgstr "bilinmeyen etiket" + +#: lib/query.c:561 #, c-format msgid "group %s does not contain any packages\n" msgstr "%s grubu hiç paket içermiyor\n" -#: lib/query.c:544 +#: lib/query.c:570 #, c-format msgid "no package triggers %s\n" msgstr "%s tetikleyen paket yok\n" -#: lib/query.c:557 lib/query.c:578 lib/query.c:598 lib/query.c:632 +#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658 #, fuzzy, c-format msgid "malformed %s: %s\n" msgstr "%s okunamadý: %s.\n" -#: lib/query.c:567 lib/query.c:584 lib/query.c:608 lib/query.c:637 +#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663 #, fuzzy, c-format msgid "no package matches %s: %s\n" msgstr "%s tetikleyen paket yok\n" -#: lib/query.c:647 +#: lib/query.c:673 #, c-format msgid "no package requires %s\n" msgstr "%s gerektiren paket yok\n" -#: lib/query.c:658 +#: lib/query.c:684 #, c-format msgid "no package provides %s\n" msgstr "%s saðlayan paket yok\n" -#: lib/query.c:693 +#: lib/query.c:719 #, c-format msgid "file %s: %s\n" msgstr "dosya %s: %s\n" -#: lib/query.c:697 +#: lib/query.c:723 #, c-format msgid "file %s is not owned by any package\n" msgstr "%s dosyasý, hiç bir pakete ait deðil\n" -#: lib/query.c:722 +#: lib/query.c:748 #, c-format msgid "invalid package number: %s\n" msgstr "geçersiz paket numarasý: %s\n" -#: lib/query.c:725 +#: lib/query.c:751 #, c-format msgid "package record number: %u\n" msgstr "paket kayýt numarasý: %u\n" -#: lib/query.c:730 +#: lib/query.c:756 #, c-format msgid "record %u could not be read\n" msgstr "%u. kayýt okunamadý\n" -#: lib/query.c:740 lib/rpminstall.c:777 +#: lib/query.c:766 lib/rpminstall.c:778 #, c-format msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" @@ -2442,99 +2447,99 @@ msgstr "%s: açýlamadý: %s\n" msgid "makeTempFile failed\n" msgstr "makeTempFile baþarýsýz\n" -#: lib/rpmchecksig.c:111 +#: lib/rpmchecksig.c:110 #, c-format msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite baþarýsýz: %s\n" -#: lib/rpmchecksig.c:209 lib/rpmchecksig.c:702 +#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:710 #, fuzzy, c-format msgid "%s: not an rpm package\n" msgstr "argüman bir RPM paketi deðil\n" -#: lib/rpmchecksig.c:214 +#: lib/rpmchecksig.c:213 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: v1.0 RPM (eski sürüm) imzalanamaz\n" -#: lib/rpmchecksig.c:218 +#: lib/rpmchecksig.c:217 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: v2.0 RPM (eski sürüm) yeniden imzalanamaz\n" -#: lib/rpmchecksig.c:326 +#: lib/rpmchecksig.c:325 #, c-format msgid "%s: was already signed by key ID %s, skipping\n" msgstr "" -#: lib/rpmchecksig.c:357 +#: lib/rpmchecksig.c:356 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead baþarýsýz: %s\n" -#: lib/rpmchecksig.c:363 +#: lib/rpmchecksig.c:362 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature baþarýsýz: %s\n" -#: lib/rpmchecksig.c:567 +#: lib/rpmchecksig.c:575 #, fuzzy, c-format msgid "%s: import read failed.\n" msgstr "%s: readLead baþarýsýz\n" -#: lib/rpmchecksig.c:579 +#: lib/rpmchecksig.c:587 #, fuzzy, c-format msgid "%s: import failed.\n" msgstr "%s: readLead baþarýsýz\n" -#: lib/rpmchecksig.c:614 +#: lib/rpmchecksig.c:622 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead baþarýsýz\n" -#: lib/rpmchecksig.c:628 +#: lib/rpmchecksig.c:636 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead baþarýsýz\n" -#: lib/rpmchecksig.c:708 +#: lib/rpmchecksig.c:716 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ýmza bulundurmuyor (v1.0 RPM)\n" -#: lib/rpmchecksig.c:971 +#: lib/rpmchecksig.c:979 msgid "NOT OK" msgstr "TAMAM DEÐÝL" -#: lib/rpmchecksig.c:972 lib/rpmchecksig.c:986 +#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994 msgid " (MISSING KEYS:" msgstr " (EKSÝK ANAHTARLAR:" -#: lib/rpmchecksig.c:974 lib/rpmchecksig.c:988 +#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:975 lib/rpmchecksig.c:989 +#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997 msgid " (UNTRUSTED KEYS:" msgstr " (GÜVENCESÝZ ANAHTARLAR:" -#: lib/rpmchecksig.c:977 lib/rpmchecksig.c:991 +#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:985 +#: lib/rpmchecksig.c:993 msgid "OK" msgstr "Tamam" -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "NO " msgstr "HAYIR " -#: lib/rpmds.c:540 lib/rpmds.c:900 +#: lib/rpmds.c:540 lib/rpmds.c:905 msgid "YES" msgstr "EVET" -#: lib/rpmds.c:865 +#: lib/rpmds.c:870 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2543,42 +2548,47 @@ msgstr "" "\"B\" baðýmlýlýðý bir dönemsellik gerektirir (tabii ki \"A\" da)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:899 +#: lib/rpmds.c:904 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:923 +#: lib/rpmds.c:928 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" -#: lib/rpmfi.c:659 +#: lib/rpmfi.c:546 +#, c-format +msgid "%s skipped due to missingok flag\n" +msgstr "missingok flamasýndan dolayý %s atlandý\n" + +#: lib/rpmfi.c:783 msgid "========== relocations\n" msgstr "========== yeniden konumlama\n" -#: lib/rpmfi.c:663 +#: lib/rpmfi.c:787 #, c-format msgid "%5d exclude %s\n" msgstr "%5d %s'i dýþlýyor\n" -#: lib/rpmfi.c:666 +#: lib/rpmfi.c:790 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n" -#: lib/rpmfi.c:789 +#: lib/rpmfi.c:918 #, c-format msgid "excluding %s %s\n" msgstr "%s %s dýþlanýyor\n" -#: lib/rpmfi.c:799 +#: lib/rpmfi.c:928 #, c-format msgid "relocating %s to %s\n" msgstr "%s %s'e konumlanýyor\n" -#: lib/rpmfi.c:886 +#: lib/rpmfi.c:1015 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s dizini %s de yeniden konumlanýyor\n" @@ -2632,7 +2642,7 @@ msgstr "... %s olarak\n" msgid "skipping %s - transfer failed - %s\n" msgstr "%s atlanýyor - aktarým baþarýsýz - %s\n" -#: lib/rpminstall.c:481 lib/rpminstall.c:858 tools/rpmgraph.c:140 +#: lib/rpminstall.c:481 lib/rpminstall.c:872 tools/rpmgraph.c:140 #, c-format msgid "%s cannot be installed\n" msgstr "%s yüklenemedi\n" @@ -2652,51 +2662,51 @@ msgstr "%s dosyasýndan okuma hatalý\n" msgid "file %s requires a newer version of RPM\n" msgstr "%s dosyasý RPM'nin daha yeni bir sürümünü gerektiriyor\n" -#: lib/rpminstall.c:621 +#: lib/rpminstall.c:623 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n" -#: lib/rpminstall.c:635 lib/rpminstall.c:805 lib/rpminstall.c:1225 +#: lib/rpminstall.c:637 lib/rpminstall.c:810 lib/rpminstall.c:1239 #: tools/rpmgraph.c:195 #, fuzzy msgid "Failed dependencies:\n" msgstr "baðýmlýlýklarda hata; gerekli paketler:\n" -#: lib/rpminstall.c:642 tools/rpmgraph.c:201 +#: lib/rpminstall.c:644 tools/rpmgraph.c:201 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:672 +#: lib/rpminstall.c:674 msgid "installing binary packages\n" msgstr "icra edilebilir paketleri kuruluyor\n" -#: lib/rpminstall.c:696 +#: lib/rpminstall.c:698 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s dosyasý açýlamadý: %s\n" -#: lib/rpminstall.c:780 +#: lib/rpminstall.c:787 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanýmlýyor\n" -#: lib/rpminstall.c:842 +#: lib/rpminstall.c:856 #, c-format msgid "cannot open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/rpminstall.c:848 +#: lib/rpminstall.c:862 #, c-format msgid "Installing %s\n" msgstr "%s kuruluyor\n" -#: lib/rpminstall.c:1219 +#: lib/rpminstall.c:1233 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpmlead.c:55 +#: lib/rpmlead.c:56 #, c-format msgid "read failed: %s (%d)\n" msgstr "okuma baþarýsýz: %s (%d)\n" @@ -2907,36 +2917,51 @@ msgstr "%s okunamýyor, EV çok büyük\n" msgid "Unable to open %s for reading: %s.\n" msgstr "%s okuma eriþimi için açýlamadý: %s.\n" -#: lib/rpmts.c:156 +#: lib/rpmts.c:162 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabaný açýlamadý\n" -#: lib/rpmts.c:341 +#: lib/rpmts.c:246 +#, fuzzy, c-format +msgid "extra '(' in package label: %s\n" +msgstr "geçersiz paket numarasý: %s\n" + +#: lib/rpmts.c:264 +#, fuzzy, c-format +msgid "missing '(' in package label: %s\n" +msgstr "%s içinde '(' yok: %s\n" + +#: lib/rpmts.c:272 +#, fuzzy, c-format +msgid "missing ')' in package label: %s\n" +msgstr "geçersiz paket numarasý: %s\n" + +#: lib/rpmts.c:448 #, fuzzy, c-format msgid "cannot open Solve database in %s\n" msgstr "%s dizininde rpm veritabaný açýlamýyor\n" -#: lib/rpmts.c:483 +#: lib/rpmts.c:590 #, fuzzy, c-format msgid "Adding: %s\n" msgstr "satýr: %s\n" -#: lib/rpmts.c:495 +#: lib/rpmts.c:602 #, fuzzy, c-format msgid "Suggesting: %s\n" msgstr "%s alýnýyor\n" -#: lib/rpmts.c:923 +#: lib/rpmts.c:1070 #, fuzzy msgid "mounted filesystems:\n" msgstr "baðlý dosya sistemlerinin listesi alýnýyor\n" -#: lib/rpmts.c:925 +#: lib/rpmts.c:1072 msgid " i dev bsize bavail iavail mount point\n" msgstr "" -#: lib/rpmts.c:981 +#: lib/rpmts.c:1128 #, c-format msgid "%5d 0x%04x %5u %12ld %12ld %s\n" msgstr "" @@ -3068,49 +3093,44 @@ msgstr "Makro dosyanýzda \"%%_pgp_name\" belirtmelisiniz\n" msgid "Header+Payload size: " msgstr "Baþlýk çok uzun" -#: lib/signature.c:1015 +#: lib/signature.c:1016 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:1071 +#: lib/signature.c:1075 #, fuzzy msgid "Header SHA1 digest: " msgstr "Baþlýk SHA1 özümlemesi doðrulanmaz" -#: lib/signature.c:1146 +#: lib/signature.c:1152 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "tüm MD5 imzalarýný atlar" -#: lib/signature.c:1263 +#: lib/signature.c:1273 msgid "Header " msgstr "" -#: lib/signature.c:1264 +#: lib/signature.c:1274 #, fuzzy msgid "V3 DSA signature: " msgstr "Ýmza yok\n" -#: lib/signature.c:1343 +#: lib/signature.c:1357 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1370 +#: lib/signature.c:1384 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1374 +#: lib/signature.c:1388 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:105 -#, c-format -msgid "%s skipped due to missingok flag\n" -msgstr "missingok flamasýndan dolayý %s atlandý\n" - #. @innercontinue@ -#: lib/transaction.c:954 +#: lib/transaction.c:891 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" @@ -3123,7 +3143,7 @@ msgstr "%s dizini dýþlanýyor\n" #. * For packages being removed: #. * - count files. #. -#: lib/transaction.c:1065 +#: lib/transaction.c:1004 #, c-format msgid "sanity checking %d elements\n" msgstr "" @@ -3136,7 +3156,7 @@ msgstr "" #. * calling fpLookupList only once. I'm not sure that the speedup is #. * worth the trouble though. #. -#: lib/transaction.c:1153 +#: lib/transaction.c:1092 #, c-format msgid "computing %d file fingerprints\n" msgstr "" @@ -3144,16 +3164,16 @@ msgstr "" #. =============================================== #. * Compute file disposition for each package in transaction set. #. -#: lib/transaction.c:1230 +#: lib/transaction.c:1173 msgid "computing file dispositions\n" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:288 #, fuzzy, c-format msgid "missing %c %s" msgstr "eksik %s" -#: lib/verify.c:394 +#: lib/verify.c:397 #, fuzzy, c-format msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s için tatmin edici olmayan baðýmlýlýklar: " @@ -3241,71 +3261,80 @@ msgstr "%s ya çok büyük ya da çok küçük 'long' deðer içeriyor, atlandý\n" msgid "%s has too large or too small integer value, skipped\n" msgstr "%s ya çok büyük ya da çok küçük 'integer' deðer içeriyor, atlandý\n" -#: rpmdb/header.c:2700 +#: rpmdb/header.c:2685 msgid "missing { after %" msgstr "%% den sonraki { yok" -#: rpmdb/header.c:2730 +#: rpmdb/header.c:2715 msgid "missing } after %{" msgstr "%%{ den sonraki } yok" -#: rpmdb/header.c:2746 +#: rpmdb/header.c:2731 msgid "empty tag format" msgstr "etiket biçemi boþ" -#: rpmdb/header.c:2758 +#: rpmdb/header.c:2743 msgid "empty tag name" msgstr "etiket ismi boþ" -#: rpmdb/header.c:2767 +#: rpmdb/header.c:2752 msgid "unknown tag" msgstr "bilinmeyen etiket" -#: rpmdb/header.c:2794 +#: rpmdb/header.c:2779 msgid "] expected at end of array" msgstr "dizinin sonunda ] gerekli" -#: rpmdb/header.c:2807 +#: rpmdb/header.c:2792 msgid "unexpected ]" msgstr "beklenmeyen ]" -#: rpmdb/header.c:2820 +#: rpmdb/header.c:2805 msgid "unexpected }" msgstr "beklenmeyen }" -#: rpmdb/header.c:2884 +#: rpmdb/header.c:2869 msgid "? expected in expression" msgstr "ifade içerisinde ? gerekli" -#: rpmdb/header.c:2891 +#: rpmdb/header.c:2876 msgid "{ expected after ? in expression" msgstr "ifade içerisinde ? dan sonra { gerekli" -#: rpmdb/header.c:2903 rpmdb/header.c:2943 +#: rpmdb/header.c:2888 rpmdb/header.c:2928 msgid "} expected in expression" msgstr "ifade içinde } gerekli" -#: rpmdb/header.c:2911 +#: rpmdb/header.c:2896 msgid ": expected following ? subexpression" msgstr "? alt ifadesinden sonra : gerekli" -#: rpmdb/header.c:2929 +#: rpmdb/header.c:2914 msgid "{ expected after : in expression" msgstr "ifade içersinde : den sonra { gerekli" -#: rpmdb/header.c:2951 +#: rpmdb/header.c:2936 msgid "| expected at end of expression" msgstr "ifadenin sonunda | gerekli" #. @=modobserver =observertrans@ -#: rpmdb/header.c:3052 +#: rpmdb/header.c:3037 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3299 +#: rpmdb/header.c:3284 msgid "array iterator used with different sized arrays" msgstr "" +#: rpmdb/header.c:3600 +#, c-format +msgid "%c" +msgstr "" + +#: rpmdb/header.c:3616 +msgid "%a %b %d %Y" +msgstr "" + #: rpmdb/header_internal.c:164 #, c-format msgid "Data type %d not supported\n" @@ -3327,179 +3356,179 @@ msgstr "veritabaný dosyaralýný doðrular" msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "(eski) rpm[23] paketleme ile uyumlu baþlýklarý üretir" -#: rpmdb/rpmdb.c:212 +#: rpmdb/rpmdb.c:213 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: tanýmlanmamýþ etiket adý: \"%s\" yoksayýldý\n" -#: rpmdb/rpmdb.c:281 +#: rpmdb/rpmdb.c:282 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "%s indeksi db%d - %s (%d) kullanarak açýlamadý\n" -#: rpmdb/rpmdb.c:301 +#: rpmdb/rpmdb.c:302 #, c-format msgid "cannot open %s index\n" msgstr "%s indeksi açýlamadý\n" -#: rpmdb/rpmdb.c:914 +#: rpmdb/rpmdb.c:915 msgid "no dbpath has been set\n" msgstr "belirtilmiþ bir dbpath deðeri yok\n" -#: rpmdb/rpmdb.c:1192 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:1372 rpmdb/rpmdb.c:2315 -#: rpmdb/rpmdb.c:2431 rpmdb/rpmdb.c:3160 +#: rpmdb/rpmdb.c:1193 rpmdb/rpmdb.c:1322 rpmdb/rpmdb.c:1373 rpmdb/rpmdb.c:2316 +#: rpmdb/rpmdb.c:2432 rpmdb/rpmdb.c:3161 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" -#: rpmdb/rpmdb.c:1566 +#: rpmdb/rpmdb.c:1567 msgid "miFreeHeader: skipping" msgstr "" -#: rpmdb/rpmdb.c:1576 +#: rpmdb/rpmdb.c:1577 #, fuzzy, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:2208 +#: rpmdb/rpmdb.c:2209 msgid "rpmdbNextIterator: skipping" msgstr "" -#: rpmdb/rpmdb.c:2235 +#: rpmdb/rpmdb.c:2236 #, fuzzy, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: bozuk baþlýk örneði #%u alýndý, atlanýyor.\n" -#: rpmdb/rpmdb.c:2519 +#: rpmdb/rpmdb.c:2520 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x de baþlýk okunamadý\n" -#: rpmdb/rpmdb.c:2582 +#: rpmdb/rpmdb.c:2583 #, fuzzy, c-format msgid "error(%d) setting header #%d record for %s removal\n" msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" -#: rpmdb/rpmdb.c:2697 +#: rpmdb/rpmdb.c:2698 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "\"%s\" %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2701 +#: rpmdb/rpmdb.c:2702 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%d girdi %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2729 +#: rpmdb/rpmdb.c:2730 #, fuzzy, c-format msgid "error(%d) setting \"%s\" records from %s index\n" msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" -#: rpmdb/rpmdb.c:2750 +#: rpmdb/rpmdb.c:2751 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:2760 +#: rpmdb/rpmdb.c:2761 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "hata(%d) %s kaydýn %s dosyasýndan silinmesi\n" -#: rpmdb/rpmdb.c:2909 +#: rpmdb/rpmdb.c:2910 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "yeni paket örneðini tutma hatasý(%d)\n" -#: rpmdb/rpmdb.c:2963 +#: rpmdb/rpmdb.c:2964 #, fuzzy msgid "rpmdbAdd: skipping" msgstr "rpmdb: bozuk baþlýk örneði #%u alýndý, atlanýyor.\n" -#: rpmdb/rpmdb.c:3135 +#: rpmdb/rpmdb.c:3136 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "\"%s\" %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:3139 +#: rpmdb/rpmdb.c:3140 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%d girdi %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:3179 +#: rpmdb/rpmdb.c:3180 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:3580 +#: rpmdb/rpmdb.c:3581 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "baþarýlý db3 yeniden oluþturma ertesinde %s kaldýrýlýyor\n" -#: rpmdb/rpmdb.c:3618 +#: rpmdb/rpmdb.c:3619 msgid "no dbpath has been set" msgstr "belirtilmiþ bir dbpath yok" -#: rpmdb/rpmdb.c:3650 +#: rpmdb/rpmdb.c:3651 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n" -#: rpmdb/rpmdb.c:3654 +#: rpmdb/rpmdb.c:3655 #, c-format msgid "temporary database %s already exists\n" msgstr "geçici veritabaný %s zaten mevcut\n" -#: rpmdb/rpmdb.c:3660 +#: rpmdb/rpmdb.c:3661 #, c-format msgid "creating directory %s\n" msgstr "%s dizini oluþturuluyor\n" -#: rpmdb/rpmdb.c:3662 +#: rpmdb/rpmdb.c:3663 #, c-format msgid "creating directory %s: %s\n" msgstr "%s dizini oluþturuluyor: %s\n" -#: rpmdb/rpmdb.c:3669 +#: rpmdb/rpmdb.c:3670 #, c-format msgid "opening old database with dbapi %d\n" msgstr "eski veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3682 +#: rpmdb/rpmdb.c:3683 #, c-format msgid "opening new database with dbapi %d\n" msgstr "yeni veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3711 +#: rpmdb/rpmdb.c:3712 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n" -#: rpmdb/rpmdb.c:3751 +#: rpmdb/rpmdb.c:3752 #, c-format msgid "cannot add record originally at %u\n" msgstr "kayýt özgün olarak %u e eklenemedi\n" -#: rpmdb/rpmdb.c:3769 +#: rpmdb/rpmdb.c:3766 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "veritabaný yeniden oluþturulamadý: mevcut veritabaný deðiþmeden\n" "yerinde býrakýldý\n" -#: rpmdb/rpmdb.c:3777 +#: rpmdb/rpmdb.c:3774 msgid "failed to replace old database with new database!\n" msgstr "eski veritabanýnýn yenisiyle deðiþtirilirmesi baþarýsýz!\n" -#: rpmdb/rpmdb.c:3779 +#: rpmdb/rpmdb.c:3776 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deðiþtiriliyor" -#: rpmdb/rpmdb.c:3789 +#: rpmdb/rpmdb.c:3786 #, c-format msgid "removing directory %s\n" msgstr "%s dizini siliniyor\n" -#: rpmdb/rpmdb.c:3791 +#: rpmdb/rpmdb.c:3788 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s dizininin silinmesi baþarýsýz: %s\n" @@ -3510,144 +3539,144 @@ msgid "======================== active %d empty %d\n" msgstr "======================== %d etkin %d boþ\n" #. XXX just in case -#: rpmio/macro.c:373 +#: rpmio/macro.c:374 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(boþ)" -#: rpmio/macro.c:416 +#: rpmio/macro.c:417 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(boþ)\n" -#: rpmio/macro.c:654 +#: rpmio/macro.c:655 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "%%%s makrosunun gövdesi sonlandýrýlmamýþ\n" -#: rpmio/macro.c:687 +#: rpmio/macro.c:688 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "%%%s makrosunun ismi kuraldýþý (%%define)\n" -#: rpmio/macro.c:693 +#: rpmio/macro.c:694 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "%%%s makrosunu seçenekleri sonlandýrýlmamýþ\n" -#: rpmio/macro.c:698 +#: rpmio/macro.c:699 #, c-format msgid "Macro %%%s has empty body\n" msgstr "%%%s makrosu boþ\n" -#: rpmio/macro.c:704 +#: rpmio/macro.c:705 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "%%%s makrosu geniþletmede baþarýsýz\n" -#: rpmio/macro.c:739 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "%%%s makrosunun ismi kuraldýþý (%%define)\n" -#: rpmio/macro.c:857 +#: rpmio/macro.c:858 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "%%%s (%s) makrosu %d seviyenin altýnda kullanýlmadý\n" -#: rpmio/macro.c:978 +#: rpmio/macro.c:982 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "%c seçeneði %s(%s) de anlaþýlamadý\n" -#: rpmio/macro.c:1176 +#: rpmio/macro.c:1182 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Yineleme derinliði(%d) mümkün miktardan(%d) büyük\n" -#: rpmio/macro.c:1246 rpmio/macro.c:1263 +#: rpmio/macro.c:1252 rpmio/macro.c:1269 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c sonlandýrýlmamýþ: %s\n" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1310 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Bir ayrýþtýrýlamayan makro tarafýndan bir %% izlendi\n" -#: rpmio/macro.c:1433 +#: rpmio/macro.c:1439 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "%%%.*s makrosu bulunamadý, atlanýyor\n" -#: rpmio/macro.c:1504 +#: rpmio/macro.c:1510 msgid "Target buffer overflow\n" msgstr "Hedef tampon bellek taþtý\n" #. XXX Fstrerror -#: rpmio/macro.c:1699 rpmio/macro.c:1705 +#: rpmio/macro.c:1705 rpmio/macro.c:1711 #, c-format msgid "File %s: %s\n" msgstr "%s dosyasý: %s\n" -#: rpmio/macro.c:1708 +#: rpmio/macro.c:1714 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "%s dosyasý %u bayttan küçük\n" -#: rpmio/rpmio.c:664 +#: rpmio/rpmio.c:632 msgid "Success" msgstr "Baþarýlý" -#: rpmio/rpmio.c:667 +#: rpmio/rpmio.c:635 msgid "Bad server response" msgstr "Sunucudan kötü yanýt" -#: rpmio/rpmio.c:670 +#: rpmio/rpmio.c:638 msgid "Server I/O error" msgstr "Sunucu G/Ç hatasý" -#: rpmio/rpmio.c:673 +#: rpmio/rpmio.c:641 msgid "Server timeout" msgstr "Sunucu zaman aþýmý" -#: rpmio/rpmio.c:676 +#: rpmio/rpmio.c:644 msgid "Unable to lookup server host address" msgstr "Sunucu makina adresi bulunamadý" -#: rpmio/rpmio.c:679 +#: rpmio/rpmio.c:647 msgid "Unable to lookup server host name" msgstr "Sunucu makina ismi bulunamadý" -#: rpmio/rpmio.c:682 +#: rpmio/rpmio.c:650 msgid "Failed to connect to server" msgstr "Sunucuya baðlanýlamadý" -#: rpmio/rpmio.c:685 +#: rpmio/rpmio.c:653 msgid "Failed to establish data connection to server" msgstr "Sunucuya veri baðlantýsý kurulamadý" -#: rpmio/rpmio.c:688 +#: rpmio/rpmio.c:656 msgid "I/O error to local file" msgstr "Yerel dosyaya G/Ç hatasý" -#: rpmio/rpmio.c:691 +#: rpmio/rpmio.c:659 msgid "Error setting remote server to passive mode" msgstr "Karþý sunucuyu pasif kipe sokma ayarlarýnda hata" -#: rpmio/rpmio.c:694 +#: rpmio/rpmio.c:662 msgid "File not found on server" msgstr "Dosya sunucuda bulunamadý" -#: rpmio/rpmio.c:697 +#: rpmio/rpmio.c:665 msgid "Abort in progress" msgstr "Kesme iþlemi sürüyor" -#: rpmio/rpmio.c:701 +#: rpmio/rpmio.c:669 msgid "Unknown or unexpected error" msgstr "Bilinmeyen ya da beklenmeyen hata" -#: rpmio/rpmio.c:1401 +#: rpmio/rpmio.c:1362 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "%s sunucusuna %s olarak giriliyor, parola %s\n" diff --git a/popt/.splintrc b/popt/.splintrc index 3f9490c29..e0277655a 100644 --- a/popt/.splintrc +++ b/popt/.splintrc @@ -3,7 +3,6 @@ #+partial +forcehints -#-warnunixlib -warnposix +unixlib @@ -17,13 +16,11 @@ -bufferoverflowhigh # --- +partial artifacts --fcnuse # 7 # --- not-yet at strict level -bitwisesigned # 75 -elseifcomplete # 18 -exportfcn # 25 --globs # 12 <ctype.h> -ifblock # 202 -namechecks # 206 -ptrarith # 43 diff --git a/popt/popt.h b/popt/popt.h index d55c0fe86..7be75de38 100644 --- a/popt/popt.h +++ b/popt/popt.h @@ -229,7 +229,8 @@ typedef void (*poptCallbackType) (poptContext con, * @param flags or'd POPT_CONTEXT_* bits * @return initialized popt context */ -/*@only@*/ /*@null@*/ poptContext poptGetContext( +/*@only@*/ /*@null@*/ +poptContext poptGetContext( /*@dependent@*/ /*@keep@*/ const char * name, int argc, /*@dependent@*/ /*@keep@*/ const char ** argv, /*@dependent@*/ /*@keep@*/ const struct poptOption * options, @@ -258,7 +259,7 @@ int poptGetNextOpt(/*@null@*/poptContext con) * @param con context * @return option argument, NULL if no argument is available */ -/*@observer@*/ /*@null@*/ +/*@observer@*/ /*@null@*/ /*@unused@*/ const char * poptGetOptArg(/*@null@*/poptContext con) /*@modifies con @*/; @@ -267,7 +268,7 @@ const char * poptGetOptArg(/*@null@*/poptContext con) * @param con context * @return next argument, NULL if no argument is available */ -/*@observer@*/ /*@null@*/ +/*@observer@*/ /*@null@*/ /*@unused@*/ const char * poptGetArg(/*@null@*/poptContext con) /*@modifies con @*/; @@ -276,7 +277,7 @@ const char * poptGetArg(/*@null@*/poptContext con) * @param con context * @return current argument, NULL if no argument is available */ -/*@observer@*/ /*@null@*/ +/*@observer@*/ /*@null@*/ /*@unused@*/ const char * poptPeekArg(/*@null@*/poptContext con) /*@*/; @@ -314,6 +315,7 @@ poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con) * @param argv argument array, NULL terminated * @return 0 on success, POPT_ERROR_OPTSTOODEEP on failure */ +/*@unused@*/ int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv) /*@modifies con @*/; @@ -357,6 +359,7 @@ int poptReadConfigFile(poptContext con, const char * fn) * @param useEnv (unused) * @return 0 on success, POPT_ERROR_ERRNO on failure */ +/*@unused@*/ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv) /*@globals fileSystem, internalState @*/ /*@modifies con->execs, con->numExecs, @@ -460,6 +463,7 @@ const char *const poptStrerror(const int error) * @param path single path to search for executables * @param allowAbsolute absolute paths only? */ +/*@unused@*/ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) /*@modifies con @*/; diff --git a/popt/popthelp.c b/popt/popthelp.c index c7dd15150..8d4ab6a3b 100644 --- a/popt/popthelp.c +++ b/popt/popthelp.c @@ -54,6 +54,9 @@ struct poptOption poptAliasOptions[] = { /*@-castfcnptr@*/ /*@observer@*/ /*@unchecked@*/ struct poptOption poptHelpOptions[] = { +/*@-readonlytrans@*/ + { NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL}, +/*@=readonlytrans@*/ { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL }, { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL }, { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL }, diff --git a/popt/system.h b/popt/system.h index 685860c33..c3d46cba8 100644 --- a/popt/system.h +++ b/popt/system.h @@ -37,7 +37,8 @@ extern __const __int32_t *__ctype_toupper; #if defined(__LCLINT__) /*@-declundef -incondefs @*/ /* LCL: missing annotation */ -/*@only@*/ /*@out@*/ void * alloca (size_t __size) +/*@only@*/ /*@out@*/ +void * alloca (size_t __size) /*@ensures MaxSet(result) == (__size - 1) @*/ /*@*/; /*@=declundef =incondefs @*/ @@ -61,7 +62,8 @@ char *alloca (); #endif /*@-redecl -redef@*/ -/*@mayexit@*/ /*@only@*/ char * xstrdup (const char *str) +/*@mayexit@*/ /*@only@*/ /*@unused@*/ +char * xstrdup (const char *str) /*@*/; /*@=redecl =redef@*/ diff --git a/python/Makefile.am b/python/Makefile.am index 0a6f43cc1..999321368 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -9,7 +9,7 @@ PYVER= @WITH_PYTHON_VERSION@ pylibdir = $(shell python -c 'import sys; print sys.path[1]') pyincdir = $(prefix)/include/python${PYVER} -SUBDIRS = rpmdb mpw +SUBDIRS = rpmdb EXTRA_DIST = rpmdebug-py.c @@ -24,7 +24,6 @@ INCLUDES = -I. \ @INCPATH@ noinst_HEADERS = header-py.h \ - rpmbc-py.h rpmmpw-py.h rpmrng-py.h \ rpmal-py.h rpmds-py.h rpmdb-py.h rpmfd-py.h rpmfts-py.h \ rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h @@ -46,7 +45,7 @@ rpmdb_PROGRAMS = _rpmdb.so noinst_PROGRAMS = poptmodule.so rpmmodule_so_SOURCES = -rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so +rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so rpmmodule_so_LDADD = @WITH_BEECRYPT_LIB@ _rpmdb_so_SOURCES = _rpmdb.c @@ -57,25 +56,24 @@ poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so noinst_LTLIBRARIES = librpmmodule.la librpmmodule_la_SOURCES = rpmmodule.c header-py.c \ - rpmbc-py.c rpmmpw-py.c rpmrng-py.c \ rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \ rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c +librpmmodule_OBJECTS = $(subst .c,.o,$(librpmmodule_la_SOURCES)) -rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS) - $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS) +rpmmodule.so$(EXEEXT): librpmmodule.la + $(CC) -o $@ $(librpmmodule_OBJECTS) $(rpmmodule_so_LDFLAGS) -_rpmdb.so$(EXEEXT): _rpmdb.lo - $(CC) -o $@ _rpmdb.lo $(_rpmdb_so_LDFLAGS) +_rpmdb.so$(EXEEXT): _rpmdb.o + $(CC) -o $@ _rpmdb.o $(_rpmdb_so_LDFLAGS) -poptmodule.so$(EXEEXT): poptmodule.lo - $(CC) -o $@ poptmodule.lo $(poptmodule_so_LDFLAGS) +poptmodule.so$(EXEEXT): poptmodule.o + $(CC) -o $@ poptmodule.o $(poptmodule_so_LDFLAGS) # rpmmodule.c header-py.c \ # rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \ # rpmrc-py.c rpmte-py.c rpmts-py.c # rpmmodule.c header-py.c splint_srcs = \ - rpmbc-py.c rpmmpw-py.c rpmrng-py.c \ rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \ rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c diff --git a/python/_rpmdb.c b/python/_rpmdb.c index 5a10bf893..659485400 100644 --- a/python/_rpmdb.c +++ b/python/_rpmdb.c @@ -579,7 +579,7 @@ static PyObject* _DBCursor_get(DBCursorObject* self, int extra_flags, char* kwnames[] = { "flags", "dlen", "doff", NULL }; if (!PyArg_ParseTupleAndKeywords(args, kwargs, format, kwnames, - &flags, &dlen, &doff)) + &flags, &dlen, &doff)) return NULL; CHECK_CURSOR_NOT_CLOSED(self); @@ -1634,7 +1634,7 @@ DB_open(DBObject* self, PyObject* args, PyObject* kwargs) * explicitly passed) but we are in a transaction ready environment: * add DB_AUTO_COMMIT to allow for older pybsddb apps using transactions * to work on BerkeleyDB 4.1 without needing to modify their - * DBEnv or DB open calls. + * DBEnv or DB open calls. * TODO make this behaviour of the library configurable. */ flags |= DB_AUTO_COMMIT; @@ -2618,7 +2618,7 @@ DBC_get(DBCursorObject* self, PyObject* args, PyObject *kwargs) { PyErr_Clear(); if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi|ii:get", - &kwnames[1], + &kwnames[1], &keyobj, &flags, &dlen, &doff)) { PyErr_Clear(); diff --git a/python/header-py.h b/python/header-py.h index 046412196..72ebb9c86 100644 --- a/python/header-py.h +++ b/python/header-py.h @@ -1,18 +1,18 @@ #ifndef RPMPYTHON_HEADER #define RPMPYTHON_HEADER -/** \ingroup py_c +/** \ingroup py_c * \file python/header-py.h */ -/** \ingroup py_c +/** \ingroup py_c */ typedef struct hdrObject_s hdrObject; /*@unchecked@*/ extern PyTypeObject hdr_Type; -/** \ingroup py_c +/** \ingroup py_c */ PyObject * pyrpmError; diff --git a/python/poptmodule.c b/python/poptmodule.c index d19f3a4e1..06b665dad 100644 --- a/python/poptmodule.c +++ b/python/poptmodule.c @@ -1,12 +1,12 @@ /* * - * - * + * + * */ #define PY_POPT_VERSION "0.2" -static const char *rcs_id = "$Id: poptmodule.c,v 1.8 2002/12/10 19:46:03 jbj Exp $"; +static const char *rcs_id = "$Id: poptmodule.c,v 1.9 2003/11/23 19:52:38 jbj Exp $"; static char *module_doc = "Python bindings for the popt library\n\ \n\ @@ -23,7 +23,7 @@ and is always available from ftp://ftp.rpm.org/pub/rpm/dist"; #define debug(x, y) { printf("%s: %s\n", x, y); } #else #define debug(x, y) {} -#endif +#endif /* Functins and datatypes needed for the context object */ typedef struct poptContext_s { @@ -65,7 +65,7 @@ static PyObject * __poptOptionValue2PyObject(const struct poptOption *option) /* Do nothing */ Py_INCREF(Py_None); return Py_None; - case POPT_ARG_STRING: + case POPT_ARG_STRING: if (*(char **)(option->arg) == NULL) { Py_INCREF(Py_None); return Py_None; @@ -163,7 +163,7 @@ static PyObject * ctxGetArgs(poptContextObject *self, PyObject *argsFoo) list = PyList_New(size); if (list == NULL) return NULL; - for (i = 0; i < size; i++) + for (i = 0; i < size; i++) PyList_SetItem(list, i, PyString_FromString(args[i])); return list; } @@ -172,7 +172,7 @@ static PyObject * ctxBadOption(poptContextObject *self, PyObject *args) { int flags = 0; const char *badOption; - if (!PyArg_ParseTuple(args, "|i", &flags)) + if (!PyArg_ParseTuple(args, "|i", &flags)) return NULL; badOption = poptBadOption(self->ctx, flags); if (badOption == NULL) { @@ -185,7 +185,7 @@ static PyObject * ctxBadOption(poptContextObject *self, PyObject *args) static PyObject * ctxReadDefaultConfig(poptContextObject *self, PyObject *args) { int flags = 0; - if (!PyArg_ParseTuple(args, "|i", &flags)) + if (!PyArg_ParseTuple(args, "|i", &flags)) return NULL; return PyInt_FromLong(poptReadDefaultConfig(self->ctx, flags)); } @@ -201,7 +201,7 @@ static PyObject * ctxReadConfigFile(poptContextObject *self, PyObject *args) static PyObject * ctxSetOtherOptionHelp(poptContextObject *self, PyObject *args) { const char *option; - if (!PyArg_ParseTuple(args, "s", &option)) + if (!PyArg_ParseTuple(args, "s", &option)) return NULL; poptSetOtherOptionHelp(self->ctx, option); Py_INCREF(Py_None); @@ -213,7 +213,7 @@ static PyObject * ctxPrintHelp(poptContextObject *self, PyObject *args) FILE *f; int flags = 0; PyObject *file; - if (!PyArg_ParseTuple(args, "|O!i", &PyFile_Type, &file, &flags)) + if (!PyArg_ParseTuple(args, "|O!i", &PyFile_Type, &file, &flags)) return NULL; f = PyFile_AsFile(file); if (f == NULL) @@ -254,7 +254,7 @@ static PyObject * ctxGetOptValues(poptContextObject *self, PyObject *args) return NULL; /* Create the list */ list = PyList_New(self->optionsNo); - if (list == NULL) + if (list == NULL) return NULL; for (i = 0; i < self->optionsNo; i++) { PyObject *item; @@ -383,7 +383,7 @@ int __setPoptOption(PyObject *list, struct poptOption *opt) PyErr_SetString(pypoptError, "List is too short"); return 0; } - + /* longName */ o = PyList_GetItem(list, 0); /* Sanity check */ @@ -393,10 +393,10 @@ int __setPoptOption(PyObject *list, struct poptOption *opt) if (!PyString_Check(o)) { PyErr_SetString(pypoptError, "Long name should be a string"); return 0; - } + } opt->longName = PyString_AsString(o); } - + /* shortName */ o = PyList_GetItem(list, 1); /* Sanity check */ @@ -423,7 +423,7 @@ int __setPoptOption(PyObject *list, struct poptOption *opt) PyErr_SetString(pypoptError, "At least one of the short name and long name must be specified"); return 0; } - + /* argInfo */ o = PyList_GetItem(list, 2); /* Sanity check */ @@ -432,7 +432,7 @@ int __setPoptOption(PyObject *list, struct poptOption *opt) return 0; } opt->argInfo = PyInt_AsLong(o); - + /* Initialize the rest of the arguments with safe defaults */ switch(opt->argInfo) { case POPT_ARG_STRING: @@ -464,7 +464,7 @@ int __setPoptOption(PyObject *list, struct poptOption *opt) /* If nothing left, end the stuff here */ if (listSize == 3) return 1; - + /* val */ o = PyList_GetItem(list, 3); /* Sanity check */ @@ -584,7 +584,7 @@ static PyObject * getContext(PyObject *self, PyObject *args) struct poptOption *opts; poptContextObject *c; /* We should receive name, argv and a list */ - if (!PyArg_ParseTuple(args, "zO!O!|i", &name, &PyList_Type, &a, + if (!PyArg_ParseTuple(args, "zO!O!|i", &name, &PyList_Type, &a, &PyList_Type, &o, &flags)) return NULL; /* Parse argv */ @@ -667,7 +667,7 @@ void initpopt() module = Py_InitModule3("popt", poptModuleMethods, module_doc); /* Init the constants */ dict = PyModule_GetDict(module); - PyDict_SetItemString(dict, "__version__", + PyDict_SetItemString(dict, "__version__", PyString_FromString(PY_POPT_VERSION)); PyDict_SetItemString(dict, "cvsid", PyString_FromString(rcs_id)); for (c = intConstants; c->name; c++) { diff --git a/python/rpmal-py.c b/python/rpmal-py.c index 74066717b..b91b861be 100644 --- a/python/rpmal-py.c +++ b/python/rpmal-py.c @@ -1,4 +1,4 @@ -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmal-py.c */ diff --git a/python/rpmal-py.h b/python/rpmal-py.h index 24de1e3c4..0ed151b25 100644 --- a/python/rpmal-py.h +++ b/python/rpmal-py.h @@ -3,7 +3,7 @@ #include "rpmal.h" -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmal-py.h */ diff --git a/python/rpmbc-py.c b/python/rpmbc-py.c deleted file mode 100644 index d897a14f8..000000000 --- a/python/rpmbc-py.c +++ /dev/null @@ -1,200 +0,0 @@ -/** \ingroup py_c - * \file python/rpmbc-py.c - */ - -#include "system.h" - -#include "Python.h" -#ifdef __LCLINT__ -#undef PyObject_HEAD -#define PyObject_HEAD int _PyObjectHead; -#endif - -#include "rpmbc-py.h" - -#include "rpmdebug-py.c" - -#include "debug.h" - -/*@unchecked@*/ -static int _bc_debug = 0; - -#define is_rpmbc(o) ((o)->ob_type == &rpmbc_Type) - -/*@unchecked@*/ /*@observer@*/ -static const char initialiser_name[] = "rpm.bc"; - -/* ---------- */ - -static void -rpmbc_dealloc(rpmbcObject * s) - /*@*/ -{ -if (_bc_debug < -1) -fprintf(stderr, "*** rpmbc_dealloc(%p)\n", s); - - PyObject_Del(s); -} - -static int -rpmbc_print(rpmbcObject * s, FILE * fp, /*@unused@*/ int flags) - /*@*/ -{ -if (_bc_debug < -1) -fprintf(stderr, "*** rpmbc_print(%p)\n", s); - return 0; -} - -/** \ingroup py_c - */ -static int rpmbc_init(rpmbcObject * z, PyObject *args, PyObject *kwds) - /*@*/ -{ - PyObject * o = NULL; - - if (!PyArg_ParseTuple(args, "|O:Cvt", &o)) return -1; - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_init(%p[%s],%p[%s],%p[%s])\n", z, lbl(z), args, lbl(args), kwds, lbl(kwds)); - - return 0; -} - -/** \ingroup py_c - */ -static void rpmbc_free(/*@only@*/ rpmbcObject * s) - /*@*/ -{ -if (_bc_debug) -fprintf(stderr, "*** rpmbc_free(%p[%s])\n", s, lbl(s)); - PyObject_Del(s); -} - -/** \ingroup py_c - */ -static PyObject * rpmbc_alloc(PyTypeObject * subtype, int nitems) - /*@*/ -{ - PyObject * ns = PyType_GenericAlloc(subtype, nitems); - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_alloc(%p[%s},%d) ret %p[%s]\n", subtype, lbl(subtype), nitems, ns, lbl(ns)); - return (PyObject *) ns; -} - -static PyObject * -rpmbc_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds) - /*@*/ -{ - PyObject * ns = (PyObject *) PyObject_New(rpmbcObject, &rpmbc_Type); - -if (_bc_debug < -1) -fprintf(stderr, "*** rpmbc_new(%p[%s],%p[%s],%p[%s]) ret %p[%s]\n", subtype, lbl(subtype), args, lbl(args), kwds, lbl(kwds), ns, lbl(ns)); - return ns; -} - -static rpmbcObject * -rpmbc_New(void) -{ - rpmbcObject * ns = PyObject_New(rpmbcObject, &rpmbc_Type); - - return ns; -} - -/* ---------- */ - -/** \ingroup py_c - */ -static PyObject * -rpmbc_Debug(/*@unused@*/ rpmbcObject * s, PyObject * args) - /*@globals _Py_NoneStruct @*/ - /*@modifies _Py_NoneStruct @*/ -{ - if (!PyArg_ParseTuple(args, "i:Debug", &_bc_debug)) return NULL; - -if (_bc_debug < 0) -fprintf(stderr, "*** rpmbc_Debug(%p)\n", s); - - Py_INCREF(Py_None); - return Py_None; -} - -/*@-fullinitblock@*/ -/*@unchecked@*/ /*@observer@*/ -static struct PyMethodDef rpmbc_methods[] = { - {"Debug", (PyCFunction)rpmbc_Debug, METH_VARARGS, - NULL}, - {NULL, NULL} /* sentinel */ -}; -/*@=fullinitblock@*/ - -static PyObject * rpmbc_getattro(PyObject * o, PyObject * n) - /*@*/ -{ - return PyObject_GenericGetAttr(o, n); -} - -static int rpmbc_setattro(PyObject * o, PyObject * n, PyObject * v) - /*@*/ -{ - return PyObject_GenericSetAttr(o, n, v); -} - -/* ---------- */ - -/** - */ -/*@unchecked@*/ /*@observer@*/ -static char rpmbc_doc[] = -""; - -/*@-fullinitblock@*/ -PyTypeObject rpmbc_Type = { - PyObject_HEAD_INIT(&PyType_Type) - 0, /* ob_size */ - "rpm.bc", /* tp_name */ - sizeof(rpmbcObject), /* tp_basicsize */ - 0, /* tp_itemsize */ - /* methods */ - (destructor) rpmbc_dealloc, /* tp_dealloc */ - (printfunc) rpmbc_print, /* tp_print */ - (getattrfunc)0, /* tp_getattr */ - (setattrfunc)0, /* tp_setattr */ - (cmpfunc)0, /* tp_compare */ - (reprfunc)0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - (hashfunc)0, /* tp_hash */ - (ternaryfunc)0, /* tp_call */ - (reprfunc)0, /* tp_str */ - (getattrofunc) rpmbc_getattro, /* tp_getattro */ - (setattrofunc) rpmbc_setattro, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT, /* tp_flags */ - rpmbc_doc, /* tp_doc */ -#if Py_TPFLAGS_HAVE_ITER - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - (getiterfunc)0, /* tp_iter */ - (iternextfunc)0, /* tp_iternext */ - rpmbc_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc) rpmbc_init, /* tp_init */ - (allocfunc) rpmbc_alloc, /* tp_alloc */ - (newfunc) rpmbc_new, /* tp_new */ - (destructor) rpmbc_free, /* tp_free */ - 0, /* tp_is_gc */ -#endif -}; -/*@=fullinitblock@*/ - -/* ---------- */ diff --git a/python/rpmbc-py.h b/python/rpmbc-py.h index 550976602..b75409326 100644 --- a/python/rpmbc-py.h +++ b/python/rpmbc-py.h @@ -3,7 +3,7 @@ #include "rpmio_internal.h" -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmbc-py.h */ diff --git a/python/rpmdb-py.c b/python/rpmdb-py.c index 6373cd1b6..88b80a9f1 100644 --- a/python/rpmdb-py.c +++ b/python/rpmdb-py.c @@ -1,4 +1,4 @@ -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmdb-py.c */ @@ -23,37 +23,37 @@ /** \ingroup python * \class Rpmdb * \brief A python rpmdb object represents an RPM database. - * + * * Instances of the rpmdb object provide access to the records of a * RPM database. The records are accessed by index number. To * retrieve the header data in the RPM database, the rpmdb object is * subscripted as you would access members of a list. - * + * * The rpmdb class contains the following methods: - * + * * - firstkey() Returns the index of the first record in the database. * @deprecated Use mi = ts.dbMatch() (or db.match()) instead. - * + * * - nextkey(index) Returns the index of the next record after "index" in the * database. * @param index current rpmdb location * @deprecated Use hdr = mi.next() instead. - * + * * - findbyfile(file) Returns a list of the indexes to records that own file * "file". * @param file absolute path to file * @deprecated Use mi = ts.dbMatch('basename') instead. - * + * * - findbyname(name) Returns a list of the indexes to records for packages * named "name". * @param name package name * @deprecated Use mi = ts.dbMatch('name') instead. - * + * * - findbyprovides(dep) Returns a list of the indexes to records for packages * that provide "dep". * @param dep provided dependency string * @deprecated Use mi = ts.dbMmatch('providename') instead. - * + * * To obtain a db object explicitly, the opendb function in the rpm module * can be called. The opendb function takes two optional arguments. * The first optional argument is a boolean flag that specifies if the @@ -76,7 +76,7 @@ * db = rpm.opendb() * mi = db.match() * \endcode - * + * * An example of opening a database and retrieving the first header in * the database, then printing the name of the package that the header * represents: diff --git a/python/rpmdb-py.h b/python/rpmdb-py.h index 4fe934a01..533b545e0 100644 --- a/python/rpmdb-py.h +++ b/python/rpmdb-py.h @@ -3,15 +3,15 @@ #include "rpmdb.h" -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmdb-py.h */ -/** \ingroup py_c +/** \ingroup py_c */ typedef struct rpmdbObject_s rpmdbObject; -/** \ingroup py_c +/** \ingroup py_c */ struct rpmdbObject_s { PyObject_HEAD diff --git a/python/rpmdebug-py.c b/python/rpmdebug-py.c index 8179671fa..e5920731e 100644 --- a/python/rpmdebug-py.c +++ b/python/rpmdebug-py.c @@ -6,7 +6,6 @@ extern PyTypeObject PyDictIter_Type; /*@unchecked@*/ extern PyTypeObject PyFrame_Type; -#include "rpmbc-py.h" /* XXX debug only */ #include <rpmcli.h> /* XXX debug only */ #include "header-py.h" /* XXX debug only */ @@ -16,9 +15,7 @@ extern PyTypeObject PyFrame_Type; #include "rpmfi-py.h" /* XXX debug only */ #include "rpmfts-py.h" /* XXX debug only */ #include "rpmmi-py.h" /* XXX debug only */ -#include "rpmmpw-py.h" /* XXX debug only */ #include "rpmrc-py.h" /* XXX debug only */ -#include "rpmrng-py.h" /* XXX debug only */ #include "rpmte-py.h" /* XXX debug only */ #include "rpmts-py.h" /* XXX debug only */ @@ -32,7 +29,7 @@ static const char * lbl(void * s) if (o == NULL) return "null"; if (o == Py_None) return "None"; - + if (o->ob_type == &PyType_Type) return o->ob_type->tp_name; @@ -71,10 +68,7 @@ static const char * lbl(void * s) if (o->ob_type == &PyUnicode_Type) return "Unicode"; if (o->ob_type == &hdr_Type) return "hdr"; - if (o->ob_type == &mpw_Type) return "mpw"; - if (o->ob_type == &rng_Type) return "rng"; if (o->ob_type == &rpmal_Type) return "rpmal"; - if (o->ob_type == &rpmbc_Type) return "rpmbc"; if (o->ob_type == &rpmds_Type) return "rpmds"; if (o->ob_type == &rpmfd_Type) return "rpmfd"; if (o->ob_type == &rpmfi_Type) return "rpmfi"; diff --git a/python/rpmds-py.c b/python/rpmds-py.c index 7862db4c8..f2035164b 100644 --- a/python/rpmds-py.c +++ b/python/rpmds-py.c @@ -1,4 +1,4 @@ -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmds-py.c */ @@ -146,7 +146,7 @@ rpmds_iternext(rpmdsObject * s) PyTuple_SET_ITEM(result, 1, Py_BuildValue("s", EVR)); PyTuple_SET_ITEM(result, 2, PyInt_FromLong(Flags)); } - + } else s->active = 0; @@ -235,7 +235,7 @@ static struct PyMethodDef rpmds_methods[] = { "ds.Refs -> Refs - Return current Refs.\n" }, {"next", (PyCFunction)rpmds_Next, METH_VARARGS, "ds.next() -> (N, EVR, Flags)\n\ -- Retrieve next dependency triple.\n" }, +- Retrieve next dependency triple.\n" }, {"SetNoPromote",(PyCFunction)rpmds_SetNoPromote, METH_VARARGS, NULL}, {"Notify", (PyCFunction)rpmds_Notify, METH_VARARGS, diff --git a/python/rpmds-py.h b/python/rpmds-py.h index 5f45d217f..b0c15b42c 100644 --- a/python/rpmds-py.h +++ b/python/rpmds-py.h @@ -3,7 +3,7 @@ #include "rpmds.h" -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmds-py.h */ diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c index 354797887..e3ae9c65d 100644 --- a/python/rpmfd-py.c +++ b/python/rpmfd-py.c @@ -1,4 +1,4 @@ -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmfd-py.c */ @@ -91,7 +91,7 @@ static int closeCallback(FILE * f) node->fd = fdFree(node->fd, "closeCallback"); node = _free (node); } - return 0; + return 0; } /** @@ -104,12 +104,12 @@ rpmfd_Fopen(/*@unused@*/ PyObject * s, PyObject * args) char * path; char * mode = "r.ufdio"; FDlist *node; - + if (!PyArg_ParseTuple(args, "s|s", &path, &mode)) return NULL; - + node = xmalloc (sizeof(FDlist)); - + node->fd = Fopen(path, mode); node->fd = fdLink(node->fd, "doFopen"); node->note = xstrdup (path); @@ -119,7 +119,7 @@ rpmfd_Fopen(/*@unused@*/ PyObject * s, PyObject * args) node = _free (node); return NULL; } - + if (Ferror(node->fd)) { const char *err = Fstrerror(node->fd); node = _free(node); @@ -144,11 +144,11 @@ rpmfd_Fopen(/*@unused@*/ PyObject * s, PyObject * args) fdhead = node; } fdtail = node; - + return PyFile_FromFile (node->f, path, mode, closeCallback); } -/** \ingroup py_c +/** \ingroup py_c */ /*@-fullinitblock@*/ /*@unchecked@*/ /*@observer@*/ @@ -163,7 +163,7 @@ static struct PyMethodDef rpmfd_methods[] = { /* ---------- */ -/** \ingroup py_c +/** \ingroup py_c */ static void rpmfd_dealloc(/*@only@*/ /*@null@*/ rpmfdObject * s) @@ -188,7 +188,7 @@ static int rpmfd_setattro(PyObject * o, PyObject * n, PyObject * v) return PyObject_GenericSetAttr(o, n, v); } -/** \ingroup py_c +/** \ingroup py_c */ static int rpmfd_init(rpmfdObject * s, PyObject *args, PyObject *kwds) /*@modifies s @*/ @@ -220,7 +220,7 @@ fprintf(stderr, "*** rpmfd_init(%p,%p,%p)\n", s, args, kwds); return 0; } -/** \ingroup py_c +/** \ingroup py_c */ static void rpmfd_free(/*@only@*/ rpmfdObject * s) /*@modifies s @*/ @@ -233,7 +233,7 @@ fprintf(stderr, "%p -- fd %p\n", s, s->fd); PyObject_Del((PyObject *)s); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmfd_alloc(PyTypeObject * subtype, int nitems) /*@*/ @@ -245,7 +245,7 @@ fprintf(stderr, "*** rpmfd_alloc(%p,%d) ret %p\n", subtype, nitems, s); return s; } -/** \ingroup py_c +/** \ingroup py_c */ static rpmfdObject * rpmfd_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds) /*@*/ @@ -270,7 +270,7 @@ fprintf(stderr, "%p ++ fd %p\n", s, s->fd); static char rpmfd_doc[] = ""; -/** \ingroup py_c +/** \ingroup py_c */ /*@-fullinitblock@*/ PyTypeObject rpmfd_Type = { diff --git a/python/rpmfd-py.h b/python/rpmfd-py.h index 23e230836..edea5e8ae 100644 --- a/python/rpmfd-py.h +++ b/python/rpmfd-py.h @@ -1,7 +1,7 @@ #ifndef H_RPMFD_PY #define H_RPMFD_PY -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmfd-py.h */ diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c index 54af9626d..bd77e15fa 100644 --- a/python/rpmfi-py.c +++ b/python/rpmfi-py.c @@ -1,4 +1,4 @@ -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmfi-py.c */ @@ -126,7 +126,7 @@ rpmfi_MD5(rpmfiObject * s, PyObject * args) char fmd5[33]; char * t; int i; - + if (!PyArg_ParseTuple(args, ":MD5")) return NULL; MD5 = rpmfiMD5(s->fi); for (i = 0, t = fmd5; i < 16; i++, t += 2) diff --git a/python/rpmfi-py.h b/python/rpmfi-py.h index 84b95b9ca..e721a349b 100644 --- a/python/rpmfi-py.h +++ b/python/rpmfi-py.h @@ -3,7 +3,7 @@ #include "rpmfi.h" -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmfi-py.h */ diff --git a/python/rpmfts-py.c b/python/rpmfts-py.c index 1d3f845ad..eee87e1c3 100644 --- a/python/rpmfts-py.c +++ b/python/rpmfts-py.c @@ -1,4 +1,4 @@ -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmfts-py.c */ @@ -48,7 +48,7 @@ static const char * ftsInfoStr(int fts_info) /*@*/ { if (!(fts_info >= 1 && fts_info <= 14)) - fts_info = 0; + fts_info = 0; return ftsInfoStrings[ fts_info ]; } @@ -88,7 +88,7 @@ rpmfts_initialize(rpmftsObject * s, const char * root, int options, int ignore) s->roots[0] = t; s->roots[ac] = NULL; (void) stpcpy(t, root); - + s->options = options; s->ignore = ignore; s->compare = NULL; @@ -267,7 +267,7 @@ rpmfts_debug(__FUNCTION__, s); return Py_BuildValue("i", rc); } -/** \ingroup py_c +/** \ingroup py_c */ /*@-fullinitblock@*/ /*@unchecked@*/ /*@observer@*/ @@ -294,13 +294,13 @@ static PyMemberDef rpmfts_members[] = { {"__dict__",T_OBJECT,offsetof(rpmftsObject, md_dict), READONLY, NULL}, {"callbacks",T_OBJECT,offsetof(rpmftsObject, callbacks), 0, -"Callback dictionary per fts_info state: FTS_{D|DC|DEFAULT|DNR|DOT|DP|ERR|F|INIT|NS|NSOK|SL|SLNONE|W}"}, +"Callback dictionary per fts_info state: FTS_{D|DC|DEFAULT|DNR|DOT|DP|ERR|F|INIT|NS|NSOK|SL|SLNONE|W}"}, {"options", T_INT, offsetof(rpmftsObject, options), 0, "Option bit(s): FTS_{COMFOLLOW|LOGICAL|NOCHDIR|NOSTAT|PHYSICAL|SEEDOT|XDEV}"}, {"ignore", T_INT, offsetof(rpmftsObject, ignore), 0, -"Ignore bit(s): (1 << info) with info one of FTS_{D|DC|DEFAULT|DNR|DOT|DP|ERR|F|INIT|NS|NSOK|SL|SLNONE|W}"}, +"Ignore bit(s): (1 << info) with info one of FTS_{D|DC|DEFAULT|DNR|DOT|DP|ERR|F|INIT|NS|NSOK|SL|SLNONE|W}"}, {NULL, 0, 0, 0, NULL} -}; +}; static PyObject * rpmfts_getattro(PyObject * o, PyObject * n) /*@*/ @@ -454,7 +454,7 @@ rpmfts_debug(__FUNCTION__, s); CONSTANT(FTS_DONTCHDIR); CONSTANT(FTS_SYMFOLLOW); - + CONSTANT(FTS_AGAIN); CONSTANT(FTS_FOLLOW); CONSTANT(FTS_NOINSTR); @@ -505,7 +505,7 @@ static int rpmfts_print(rpmftsObject * s, FILE * fp, /*@unused@*/ int flags) static char rpmfts_doc[] = ""; -/** \ingroup py_c +/** \ingroup py_c */ /*@-fullinitblock@*/ PyTypeObject rpmfts_Type = { diff --git a/python/rpmfts-py.h b/python/rpmfts-py.h index 90aa2afc0..d6b4b411a 100644 --- a/python/rpmfts-py.h +++ b/python/rpmfts-py.h @@ -1,7 +1,7 @@ #ifndef H_RPMFTS_PY #define H_RPMFTS_PY -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmfts-py.h */ diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c index 3023968e7..5fc40207f 100644 --- a/python/rpmmi-py.c +++ b/python/rpmmi-py.c @@ -1,4 +1,4 @@ -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmmi-py.c */ @@ -90,7 +90,7 @@ rpmmi_iternext(rpmmiObject * s) /*@modifies s, rpmGlobalMacroContext @*/ { Header h; - + if (s->mi == NULL || (h = rpmdbNextIterator(s->mi)) == NULL) { s->mi = rpmdbFreeIterator(s->mi); return NULL; @@ -106,7 +106,7 @@ rpmmi_Next(rpmmiObject * s, PyObject *args) /*@modifies s, rpmGlobalMacroContext, _Py_NoneStruct @*/ { PyObject * result; - + if (!PyArg_ParseTuple(args, ":Next")) return NULL; @@ -164,7 +164,7 @@ rpmmi_Pattern(rpmmiObject * s, PyObject * args) int type; char * pattern; rpmTag tag; - + if (!PyArg_ParseTuple(args, "Ois:Pattern", &TagN, &type, &pattern)) return NULL; @@ -177,10 +177,10 @@ rpmmi_Pattern(rpmmiObject * s, PyObject * args) Py_INCREF (Py_None); return Py_None; - + } -/** \ingroup py_c +/** \ingroup py_c */ /*@-fullinitblock@*/ /*@unchecked@*/ /*@observer@*/ @@ -199,7 +199,7 @@ static struct PyMethodDef rpmmi_methods[] = { }; /*@=fullinitblock@*/ -/** \ingroup py_c +/** \ingroup py_c */ static void rpmmi_dealloc(/*@only@*/ /*@null@*/ rpmmiObject * s) /*@globals rpmGlobalMacroContext @*/ @@ -229,7 +229,7 @@ static int rpmmi_setattro(PyObject * o, PyObject * n, PyObject * v) static char rpmmi_doc[] = ""; -/** \ingroup py_c +/** \ingroup py_c */ /*@-fullinitblock@*/ PyTypeObject rpmmi_Type = { diff --git a/python/rpmmi-py.h b/python/rpmmi-py.h index 712b12f83..4c08bd63e 100644 --- a/python/rpmmi-py.h +++ b/python/rpmmi-py.h @@ -1,15 +1,15 @@ #ifndef H_RPMMI_PY #define H_RPMMI_PY -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmmi-py.h */ -/** \ingroup py_c +/** \ingroup py_c */ typedef struct rpmmiObject_s rpmmiObject; -/** \ingroup py_c +/** \ingroup py_c */ struct rpmmiObject_s { PyObject_HEAD diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 1d70f65ea..7fecd2bfb 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -1,4 +1,4 @@ -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmmodule.c */ @@ -19,10 +19,6 @@ #include "header_internal.h" #include "header-py.h" -#include "rpmbc-py.h" -#include "rpmmpw-py.h" -#include "rpmrng-py.h" - #include "rpmal-py.h" #include "rpmds-py.h" #include "rpmfd-py.h" @@ -187,10 +183,7 @@ void initrpm(void) #if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */ if (PyType_Ready(&hdr_Type) < 0) return; - if (PyType_Ready(&mpw_Type) < 0) return; - if (PyType_Ready(&rng_Type) < 0) return; if (PyType_Ready(&rpmal_Type) < 0) return; - if (PyType_Ready(&rpmbc_Type) < 0) return; if (PyType_Ready(&rpmds_Type) < 0) return; if (PyType_Ready(&rpmfd_Type) < 0) return; if (PyType_Ready(&rpmfts_Type) < 0) return; @@ -226,18 +219,9 @@ void initrpm(void) Py_INCREF(&hdr_Type); PyModule_AddObject(m, "hdr", (PyObject *) &hdr_Type); - Py_INCREF(&mpw_Type); - PyModule_AddObject(m, "mpw", (PyObject *) &mpw_Type); - - Py_INCREF(&rng_Type); - PyModule_AddObject(m, "rng", (PyObject *) &rng_Type); - Py_INCREF(&rpmal_Type); PyModule_AddObject(m, "al", (PyObject *) &rpmal_Type); - Py_INCREF(&rpmbc_Type); - PyModule_AddObject(m, "bc", (PyObject *) &rpmbc_Type); - Py_INCREF(&rpmds_Type); PyModule_AddObject(m, "ds", (PyObject *) &rpmds_Type); @@ -263,10 +247,7 @@ void initrpm(void) PyModule_AddObject(m, "ts", (PyObject *) &rpmts_Type); #else hdr_Type.ob_type = &PyType_Type; - mpw_Type.ob_type = &PyType_Type; - rng_Type.ob_type = &PyType_Type; rpmal_Type.ob_type = &PyType_Type; - rpmbc_Type.ob_type = &PyType_Type; rpmds_Type.ob_type = &PyType_Type; rpmfd_Type.ob_type = &PyType_Type; rpmfts_Type.ob_type = &PyType_Type; @@ -292,7 +273,7 @@ void initrpm(void) PyDict_SetItemString(d, (char *) extensions->name, o=PyCObject_FromVoidPtr(ext, NULL)); Py_DECREF(o); PyDict_SetItem(dict, tag, o=PyString_FromString(ext->name + 7)); - Py_DECREF(o); + Py_DECREF(o); } extensions++; } @@ -304,7 +285,7 @@ void initrpm(void) #define REGISTER_ENUM(val) \ PyDict_SetItemString(d, #val, o=PyInt_FromLong( val )); \ Py_DECREF(o); - + REGISTER_ENUM(RPMFILE_STATE_NORMAL); REGISTER_ENUM(RPMFILE_STATE_REPLACED); REGISTER_ENUM(RPMFILE_STATE_NOTINSTALLED); diff --git a/python/rpmmpw-py.c b/python/rpmmpw-py.c deleted file mode 100644 index 3bf1912f0..000000000 --- a/python/rpmmpw-py.c +++ /dev/null @@ -1,2340 +0,0 @@ -/** \ingroup py_c - * \file python/rpmmpw-py.c - */ - -#include "system.h" - -#include "Python.h" -#include "longintrepr.h" - -#ifdef __LCLINT__ -#undef PyObject_HEAD -#define PyObject_HEAD int _PyObjectHead; -#endif - -#include "rpmmpw-py.h" -#include "rpmrng-py.h" - -#include "rpmdebug-py.c" - -#include "debug.h" - -#define ABS(_x) ((_x) < 0 ? -(_x) : (_x)) - -#define MPBITCNT(_s, _d) (MP_WORDS_TO_BITS(_s) - mpmszcnt((_s), (_d))) - -#define BITS_TO_DIGITS(_b) (((_b) + SHIFT - 1)/SHIFT) -#define DIGITS_TO_BITS(_d) ((_d) * SHIFT) - -/*@unchecked@*/ -static int _ie = 0x44332211; -/*@unchecked@*/ -static union _dendian { -/*@unused@*/ - int i; - char b[4]; -} *_endian = (union _dendian *)&_ie; -#define IS_BIG_ENDIAN() (_endian->b[0] == '\x44') -#define IS_LITTLE_ENDIAN() (_endian->b[0] == '\x11') - -/*@unchecked@*/ -static int _mpw_debug = 0; - -/*@unchecked@*/ /*@observer@*/ -static const char *initialiser_name = ""; - -/*@unchecked@*/ /*@observer@*/ -static const struct { - /* Number of digits in the conversion base that always fits in an mp_limb_t. - For example, for base 10 on a machine where a mp_limb_t has 32 bits this - is 9, since 10**9 is the largest number that fits into a mp_limb_t. */ - int chars_per_limb; - - /* log(2)/log(conversion_base) */ - double chars_per_bit_exactly; - - /* base**chars_per_limb, i.e. the biggest number that fits a word, built by - factors of base. Exception: For 2, 4, 8, etc, big_base is log2(base), - i.e. the number of bits used to represent each digit in the base. */ - unsigned int big_base; - - /* A BITS_PER_MP_LIMB bit approximation to 1/big_base, represented as a - fixed-point number. Instead of dividing by big_base an application can - choose to multiply by big_base_inverted. */ - unsigned int big_base_inverted; -} mp_bases[257] = { - /* 0 */ {0, 0.0, 0, 0}, - /* 1 */ {0, 1e37, 0, 0}, - /* 2 */ {32, 1.0000000000000000, 0x1, 0x0}, - /* 3 */ {20, 0.6309297535714574, 0xcfd41b91, 0x3b563c24}, - /* 4 */ {16, 0.5000000000000000, 0x2, 0x0}, - /* 5 */ {13, 0.4306765580733931, 0x48c27395, 0xc25c2684}, - /* 6 */ {12, 0.3868528072345416, 0x81bf1000, 0xf91bd1b6}, - /* 7 */ {11, 0.3562071871080222, 0x75db9c97, 0x1607a2cb}, - /* 8 */ {10, 0.3333333333333333, 0x3, 0x0}, - /* 9 */ {10, 0.3154648767857287, 0xcfd41b91, 0x3b563c24}, - /* 10 */ {9, 0.3010299956639812, 0x3b9aca00, 0x12e0be82}, - /* 11 */ {9, 0.2890648263178878, 0x8c8b6d2b, 0xd24cde04}, - /* 12 */ {8, 0.2789429456511298, 0x19a10000, 0x3fa39ab5}, - /* 13 */ {8, 0.2702381544273197, 0x309f1021, 0x50f8ac5f}, - /* 14 */ {8, 0.2626495350371935, 0x57f6c100, 0x74843b1e}, - /* 15 */ {8, 0.2559580248098155, 0x98c29b81, 0xad0326c2}, - /* 16 */ {8, 0.2500000000000000, 0x4, 0x0}, - /* 17 */ {7, 0.2446505421182260, 0x18754571, 0x4ef0b6bd}, - /* 18 */ {7, 0.2398124665681314, 0x247dbc80, 0xc0fc48a1}, - /* 19 */ {7, 0.2354089133666382, 0x3547667b, 0x33838942}, - /* 20 */ {7, 0.2313782131597592, 0x4c4b4000, 0xad7f29ab}, - /* 21 */ {7, 0.2276702486969530, 0x6b5a6e1d, 0x313c3d15}, - /* 22 */ {7, 0.2242438242175754, 0x94ace180, 0xb8cca9e0}, - /* 23 */ {7, 0.2210647294575037, 0xcaf18367, 0x42ed6de9}, - /* 24 */ {6, 0.2181042919855316, 0xb640000, 0x67980e0b}, - /* 25 */ {6, 0.2153382790366965, 0xe8d4a51, 0x19799812}, - /* 26 */ {6, 0.2127460535533632, 0x1269ae40, 0xbce85396}, - /* 27 */ {6, 0.2103099178571525, 0x17179149, 0x62c103a9}, - /* 28 */ {6, 0.2080145976765095, 0x1cb91000, 0x1d353d43}, - /* 29 */ {6, 0.2058468324604344, 0x23744899, 0xce1decea}, - /* 30 */ {6, 0.2037950470905062, 0x2b73a840, 0x790fc511}, - /* 31 */ {6, 0.2018490865820999, 0x34e63b41, 0x35b865a0}, - /* 32 */ {6, 0.2000000000000000, 0x5, 0x0}, - /* 33 */ {6, 0.1982398631705605, 0x4cfa3cc1, 0xa9aed1b3}, - /* 34 */ {6, 0.1965616322328226, 0x5c13d840, 0x63dfc229}, - /* 35 */ {6, 0.1949590218937863, 0x6d91b519, 0x2b0fee30}, - /* 36 */ {6, 0.1934264036172708, 0x81bf1000, 0xf91bd1b6}, - /* 37 */ {6, 0.1919587200065601, 0x98ede0c9, 0xac89c3a9}, - /* 38 */ {6, 0.1905514124267734, 0xb3773e40, 0x6d2c32fe}, - /* 39 */ {6, 0.1892003595168700, 0xd1bbc4d1, 0x387907c9}, - /* 40 */ {6, 0.1879018247091076, 0xf4240000, 0xc6f7a0b}, - /* 41 */ {5, 0.1866524112389434, 0x6e7d349, 0x28928154}, - /* 42 */ {5, 0.1854490234153689, 0x7ca30a0, 0x6e8629d}, - /* 43 */ {5, 0.1842888331487062, 0x8c32bbb, 0xd373dca0}, - /* 44 */ {5, 0.1831692509136336, 0x9d46c00, 0xa0b17895}, - /* 45 */ {5, 0.1820879004699383, 0xaffacfd, 0x746811a5}, - /* 46 */ {5, 0.1810425967800402, 0xc46bee0, 0x4da6500f}, - /* 47 */ {5, 0.1800313266566926, 0xdab86ef, 0x2ba23582}, - /* 48 */ {5, 0.1790522317510414, 0xf300000, 0xdb20a88}, - /* 49 */ {5, 0.1781035935540111, 0x10d63af1, 0xe68d5ce4}, - /* 50 */ {5, 0.1771838201355579, 0x12a05f20, 0xb7cdfd9d}, - /* 51 */ {5, 0.1762914343888821, 0x1490aae3, 0x8e583933}, - /* 52 */ {5, 0.1754250635819545, 0x16a97400, 0x697cc3ea}, - /* 53 */ {5, 0.1745834300480449, 0x18ed2825, 0x48a5ca6c}, - /* 54 */ {5, 0.1737653428714400, 0x1b5e4d60, 0x2b52db16}, - /* 55 */ {5, 0.1729696904450771, 0x1dff8297, 0x111586a6}, - /* 56 */ {5, 0.1721954337940981, 0x20d38000, 0xf31d2b36}, - /* 57 */ {5, 0.1714416005739134, 0x23dd1799, 0xc8d76d19}, - /* 58 */ {5, 0.1707072796637201, 0x271f35a0, 0xa2cb1eb4}, - /* 59 */ {5, 0.1699916162869140, 0x2a9ce10b, 0x807c3ec3}, - /* 60 */ {5, 0.1692938075987814, 0x2e593c00, 0x617ec8bf}, - /* 61 */ {5, 0.1686130986895011, 0x3257844d, 0x45746cbe}, - /* 62 */ {5, 0.1679487789570419, 0x369b13e0, 0x2c0aa273}, - /* 63 */ {5, 0.1673001788101741, 0x3b27613f, 0x14f90805}, - /* 64 */ {5, 0.1666666666666667, 0x6, 0x0}, - /* 65 */ {5, 0.1660476462159378, 0x4528a141, 0xd9cf0829}, - /* 66 */ {5, 0.1654425539190583, 0x4aa51420, 0xb6fc4841}, - /* 67 */ {5, 0.1648508567221603, 0x50794633, 0x973054cb}, - /* 68 */ {5, 0.1642720499620502, 0x56a94400, 0x7a1dbe4b}, - /* 69 */ {5, 0.1637056554452156, 0x5d393975, 0x5f7fcd7f}, - /* 70 */ {5, 0.1631512196835108, 0x642d7260, 0x47196c84}, - /* 71 */ {5, 0.1626083122716342, 0x6b8a5ae7, 0x30b43635}, - /* 72 */ {5, 0.1620765243931223, 0x73548000, 0x1c1fa5f6}, - /* 73 */ {5, 0.1615554674429964, 0x7b908fe9, 0x930634a}, - /* 74 */ {5, 0.1610447717564444, 0x84435aa0, 0xef7f4a3c}, - /* 75 */ {5, 0.1605440854340214, 0x8d71d25b, 0xcf5552d2}, - /* 76 */ {5, 0.1600530732548213, 0x97210c00, 0xb1a47c8e}, - /* 77 */ {5, 0.1595714156699382, 0xa1563f9d, 0x9634b43e}, - /* 78 */ {5, 0.1590988078692941, 0xac16c8e0, 0x7cd3817d}, - /* 79 */ {5, 0.1586349589155960, 0xb768278f, 0x65536761}, - /* 80 */ {5, 0.1581795909397823, 0xc3500000, 0x4f8b588e}, - /* 81 */ {5, 0.1577324383928644, 0xcfd41b91, 0x3b563c24}, - /* 82 */ {5, 0.1572932473495469, 0xdcfa6920, 0x28928154}, - /* 83 */ {5, 0.1568617748594410, 0xeac8fd83, 0x1721bfb0}, - /* 84 */ {5, 0.1564377883420715, 0xf9461400, 0x6e8629d}, - /* 85 */ {4, 0.1560210650222250, 0x31c84b1, 0x491cc17c}, - /* 86 */ {4, 0.1556113914024939, 0x342ab10, 0x3a11d83b}, - /* 87 */ {4, 0.1552085627701551, 0x36a2c21, 0x2be074cd}, - /* 88 */ {4, 0.1548123827357682, 0x3931000, 0x1e7a02e7}, - /* 89 */ {4, 0.1544226628011101, 0x3bd5ee1, 0x11d10edd}, - /* 90 */ {4, 0.1540392219542636, 0x3e92110, 0x5d92c68}, - /* 91 */ {4, 0.1536618862898642, 0x4165ef1, 0xf50dbfb2}, - /* 92 */ {4, 0.1532904886526781, 0x4452100, 0xdf9f1316}, - /* 93 */ {4, 0.1529248683028321, 0x4756fd1, 0xcb52a684}, - /* 94 */ {4, 0.1525648706011593, 0x4a75410, 0xb8163e97}, - /* 95 */ {4, 0.1522103467132434, 0x4dad681, 0xa5d8f269}, - /* 96 */ {4, 0.1518611533308632, 0x5100000, 0x948b0fcd}, - /* 97 */ {4, 0.1515171524096389, 0x546d981, 0x841e0215}, - /* 98 */ {4, 0.1511782109217764, 0x57f6c10, 0x74843b1e}, - /* 99 */ {4, 0.1508442006228941, 0x5b9c0d1, 0x65b11e6e}, - /* 100 */ {4, 0.1505149978319906, 0x5f5e100, 0x5798ee23}, - /* 101 */ {4, 0.1501904832236880, 0x633d5f1, 0x4a30b99b}, - /* 102 */ {4, 0.1498705416319474, 0x673a910, 0x3d6e4d94}, - /* 103 */ {4, 0.1495550618645152, 0x6b563e1, 0x314825b0}, - /* 104 */ {4, 0.1492439365274121, 0x6f91000, 0x25b55f2e}, - /* 105 */ {4, 0.1489370618588283, 0x73eb721, 0x1aadaccb}, - /* 106 */ {4, 0.1486343375718350, 0x7866310, 0x10294ba2}, - /* 107 */ {4, 0.1483356667053617, 0x7d01db1, 0x620f8f6}, - /* 108 */ {4, 0.1480409554829326, 0x81bf100, 0xf91bd1b6}, - /* 109 */ {4, 0.1477501131786861, 0x869e711, 0xe6d37b2a}, - /* 110 */ {4, 0.1474630519902391, 0x8ba0a10, 0xd55cff6e}, - /* 111 */ {4, 0.1471796869179852, 0x90c6441, 0xc4ad2db2}, - /* 112 */ {4, 0.1468999356504447, 0x9610000, 0xb4b985cf}, - /* 113 */ {4, 0.1466237184553111, 0x9b7e7c1, 0xa5782bef}, - /* 114 */ {4, 0.1463509580758620, 0xa112610, 0x96dfdd2a}, - /* 115 */ {4, 0.1460815796324244, 0xa6cc591, 0x88e7e509}, - /* 116 */ {4, 0.1458155105286054, 0xacad100, 0x7b8813d3}, - /* 117 */ {4, 0.1455526803620167, 0xb2b5331, 0x6eb8b595}, - /* 118 */ {4, 0.1452930208392429, 0xb8e5710, 0x627289db}, - /* 119 */ {4, 0.1450364656948130, 0xbf3e7a1, 0x56aebc07}, - /* 120 */ {4, 0.1447829506139581, 0xc5c1000, 0x4b66dc33}, - /* 121 */ {4, 0.1445324131589439, 0xcc6db61, 0x4094d8a3}, - /* 122 */ {4, 0.1442847926987864, 0xd345510, 0x3632f7a5}, - /* 123 */ {4, 0.1440400303421672, 0xda48871, 0x2c3bd1f0}, - /* 124 */ {4, 0.1437980688733776, 0xe178100, 0x22aa4d5f}, - /* 125 */ {4, 0.1435588526911310, 0xe8d4a51, 0x19799812}, - /* 126 */ {4, 0.1433223277500932, 0xf05f010, 0x10a523e5}, - /* 127 */ {4, 0.1430884415049874, 0xf817e01, 0x828a237}, - /* 128 */ {4, 0.1428571428571428, 0x7, 0x0}, - /* 129 */ {4, 0.1426283821033600, 0x10818201, 0xf04ec452}, - /* 130 */ {4, 0.1424021108869747, 0x11061010, 0xe136444a}, - /* 131 */ {4, 0.1421782821510107, 0x118db651, 0xd2af9589}, - /* 132 */ {4, 0.1419568500933153, 0x12188100, 0xc4b42a83}, - /* 133 */ {4, 0.1417377701235801, 0x12a67c71, 0xb73dccf5}, - /* 134 */ {4, 0.1415209988221527, 0x1337b510, 0xaa4698c5}, - /* 135 */ {4, 0.1413064939005528, 0x13cc3761, 0x9dc8f729}, - /* 136 */ {4, 0.1410942141636095, 0x14641000, 0x91bf9a30}, - /* 137 */ {4, 0.1408841194731412, 0x14ff4ba1, 0x86257887}, - /* 138 */ {4, 0.1406761707131039, 0x159df710, 0x7af5c98c}, - /* 139 */ {4, 0.1404703297561400, 0x16401f31, 0x702c01a0}, - /* 140 */ {4, 0.1402665594314587, 0x16e5d100, 0x65c3ceb1}, - /* 141 */ {4, 0.1400648234939879, 0x178f1991, 0x5bb91502}, - /* 142 */ {4, 0.1398650865947379, 0x183c0610, 0x5207ec23}, - /* 143 */ {4, 0.1396673142523192, 0x18eca3c1, 0x48ac9c19}, - /* 144 */ {4, 0.1394714728255649, 0x19a10000, 0x3fa39ab5}, - /* 145 */ {4, 0.1392775294872041, 0x1a592841, 0x36e98912}, - /* 146 */ {4, 0.1390854521985406, 0x1b152a10, 0x2e7b3140}, - /* 147 */ {4, 0.1388952096850913, 0x1bd51311, 0x2655840b}, - /* 148 */ {4, 0.1387067714131417, 0x1c98f100, 0x1e7596ea}, - /* 149 */ {4, 0.1385201075671774, 0x1d60d1b1, 0x16d8a20d}, - /* 150 */ {4, 0.1383351890281539, 0x1e2cc310, 0xf7bfe87}, - /* 151 */ {4, 0.1381519873525671, 0x1efcd321, 0x85d2492}, - /* 152 */ {4, 0.1379704747522905, 0x1fd11000, 0x179a9f4}, - /* 153 */ {4, 0.1377906240751463, 0x20a987e1, 0xf59e80eb}, - /* 154 */ {4, 0.1376124087861776, 0x21864910, 0xe8b768db}, - /* 155 */ {4, 0.1374358029495937, 0x226761f1, 0xdc39d6d5}, - /* 156 */ {4, 0.1372607812113589, 0x234ce100, 0xd021c5d1}, - /* 157 */ {4, 0.1370873187823978, 0x2436d4d1, 0xc46b5e37}, - /* 158 */ {4, 0.1369153914223921, 0x25254c10, 0xb912f39c}, - /* 159 */ {4, 0.1367449754241439, 0x26185581, 0xae150294}, - /* 160 */ {4, 0.1365760475984821, 0x27100000, 0xa36e2eb1}, - /* 161 */ {4, 0.1364085852596902, 0x280c5a81, 0x991b4094}, - /* 162 */ {4, 0.1362425662114337, 0x290d7410, 0x8f19241e}, - /* 163 */ {4, 0.1360779687331669, 0x2a135bd1, 0x8564e6b7}, - /* 164 */ {4, 0.1359147715670014, 0x2b1e2100, 0x7bfbb5b4}, - /* 165 */ {4, 0.1357529539050150, 0x2c2dd2f1, 0x72dadcc8}, - /* 166 */ {4, 0.1355924953769864, 0x2d428110, 0x69ffc498}, - /* 167 */ {4, 0.1354333760385373, 0x2e5c3ae1, 0x6167f154}, - /* 168 */ {4, 0.1352755763596663, 0x2f7b1000, 0x5911016e}, - /* 169 */ {4, 0.1351190772136599, 0x309f1021, 0x50f8ac5f}, - /* 170 */ {4, 0.1349638598663645, 0x31c84b10, 0x491cc17c}, - /* 171 */ {4, 0.1348099059658080, 0x32f6d0b1, 0x417b26d8}, - /* 172 */ {4, 0.1346571975321549, 0x342ab100, 0x3a11d83b}, - /* 173 */ {4, 0.1345057169479844, 0x3563fc11, 0x32dee622}, - /* 174 */ {4, 0.1343554469488779, 0x36a2c210, 0x2be074cd}, - /* 175 */ {4, 0.1342063706143054, 0x37e71341, 0x2514bb58}, - /* 176 */ {4, 0.1340584713587979, 0x39310000, 0x1e7a02e7}, - /* 177 */ {4, 0.1339117329233981, 0x3a8098c1, 0x180ea5d0}, - /* 178 */ {4, 0.1337661393673756, 0x3bd5ee10, 0x11d10edd}, - /* 179 */ {4, 0.1336216750601996, 0x3d311091, 0xbbfb88e}, - /* 180 */ {4, 0.1334783246737591, 0x3e921100, 0x5d92c68}, - /* 181 */ {4, 0.1333360731748201, 0x3ff90031, 0x1c024c}, - /* 182 */ {4, 0.1331949058177136, 0x4165ef10, 0xf50dbfb2}, - /* 183 */ {4, 0.1330548081372441, 0x42d8eea1, 0xea30efa3}, - /* 184 */ {4, 0.1329157659418126, 0x44521000, 0xdf9f1316}, - /* 185 */ {4, 0.1327777653067443, 0x45d16461, 0xd555c0c9}, - /* 186 */ {4, 0.1326407925678156, 0x4756fd10, 0xcb52a684}, - /* 187 */ {4, 0.1325048343149731, 0x48e2eb71, 0xc193881f}, - /* 188 */ {4, 0.1323698773862368, 0x4a754100, 0xb8163e97}, - /* 189 */ {4, 0.1322359088617821, 0x4c0e0f51, 0xaed8b724}, - /* 190 */ {4, 0.1321029160581950, 0x4dad6810, 0xa5d8f269}, - /* 191 */ {4, 0.1319708865228925, 0x4f535d01, 0x9d15039d}, - /* 192 */ {4, 0.1318398080287045, 0x51000000, 0x948b0fcd}, - /* 193 */ {4, 0.1317096685686114, 0x52b36301, 0x8c394d1d}, - /* 194 */ {4, 0.1315804563506306, 0x546d9810, 0x841e0215}, - /* 195 */ {4, 0.1314521597928493, 0x562eb151, 0x7c3784f8}, - /* 196 */ {4, 0.1313247675185968, 0x57f6c100, 0x74843b1e}, - /* 197 */ {4, 0.1311982683517524, 0x59c5d971, 0x6d02985d}, - /* 198 */ {4, 0.1310726513121843, 0x5b9c0d10, 0x65b11e6e}, - /* 199 */ {4, 0.1309479056113158, 0x5d796e61, 0x5e8e5c64}, - /* 200 */ {4, 0.1308240206478128, 0x5f5e1000, 0x5798ee23}, - /* 201 */ {4, 0.1307009860033912, 0x614a04a1, 0x50cf7bde}, - /* 202 */ {4, 0.1305787914387386, 0x633d5f10, 0x4a30b99b}, - /* 203 */ {4, 0.1304574268895465, 0x65383231, 0x43bb66bd}, - /* 204 */ {4, 0.1303368824626505, 0x673a9100, 0x3d6e4d94}, - /* 205 */ {4, 0.1302171484322746, 0x69448e91, 0x374842ee}, - /* 206 */ {4, 0.1300982152363760, 0x6b563e10, 0x314825b0}, - /* 207 */ {4, 0.1299800734730872, 0x6d6fb2c1, 0x2b6cde75}, - /* 208 */ {4, 0.1298627138972530, 0x6f910000, 0x25b55f2e}, - /* 209 */ {4, 0.1297461274170591, 0x71ba3941, 0x2020a2c5}, - /* 210 */ {4, 0.1296303050907487, 0x73eb7210, 0x1aadaccb}, - /* 211 */ {4, 0.1295152381234257, 0x7624be11, 0x155b891f}, - /* 212 */ {4, 0.1294009178639407, 0x78663100, 0x10294ba2}, - /* 213 */ {4, 0.1292873358018581, 0x7aafdeb1, 0xb160fe9}, - /* 214 */ {4, 0.1291744835645007, 0x7d01db10, 0x620f8f6}, - /* 215 */ {4, 0.1290623529140715, 0x7f5c3a21, 0x14930ef}, - /* 216 */ {4, 0.1289509357448472, 0x81bf1000, 0xf91bd1b6}, - /* 217 */ {4, 0.1288402240804449, 0x842a70e1, 0xefdcb0c7}, - /* 218 */ {4, 0.1287302100711566, 0x869e7110, 0xe6d37b2a}, - /* 219 */ {4, 0.1286208859913518, 0x891b24f1, 0xddfeb94a}, - /* 220 */ {4, 0.1285122442369443, 0x8ba0a100, 0xd55cff6e}, - /* 221 */ {4, 0.1284042773229231, 0x8e2ef9d1, 0xcceced50}, - /* 222 */ {4, 0.1282969778809442, 0x90c64410, 0xc4ad2db2}, - /* 223 */ {4, 0.1281903386569819, 0x93669481, 0xbc9c75f9}, - /* 224 */ {4, 0.1280843525090381, 0x96100000, 0xb4b985cf}, - /* 225 */ {4, 0.1279790124049077, 0x98c29b81, 0xad0326c2}, - /* 226 */ {4, 0.1278743114199984, 0x9b7e7c10, 0xa5782bef}, - /* 227 */ {4, 0.1277702427352035, 0x9e43b6d1, 0x9e1771a9}, - /* 228 */ {4, 0.1276667996348261, 0xa1126100, 0x96dfdd2a}, - /* 229 */ {4, 0.1275639755045533, 0xa3ea8ff1, 0x8fd05c41}, - /* 230 */ {4, 0.1274617638294791, 0xa6cc5910, 0x88e7e509}, - /* 231 */ {4, 0.1273601581921740, 0xa9b7d1e1, 0x8225759d}, - /* 232 */ {4, 0.1272591522708010, 0xacad1000, 0x7b8813d3}, - /* 233 */ {4, 0.1271587398372755, 0xafac2921, 0x750eccf9}, - /* 234 */ {4, 0.1270589147554692, 0xb2b53310, 0x6eb8b595}, - /* 235 */ {4, 0.1269596709794558, 0xb5c843b1, 0x6884e923}, - /* 236 */ {4, 0.1268610025517973, 0xb8e57100, 0x627289db}, - /* 237 */ {4, 0.1267629036018709, 0xbc0cd111, 0x5c80c07b}, - /* 238 */ {4, 0.1266653683442337, 0xbf3e7a10, 0x56aebc07}, - /* 239 */ {4, 0.1265683910770258, 0xc27a8241, 0x50fbb19b}, - /* 240 */ {4, 0.1264719661804097, 0xc5c10000, 0x4b66dc33}, - /* 241 */ {4, 0.1263760881150453, 0xc91209c1, 0x45ef7c7c}, - /* 242 */ {4, 0.1262807514205999, 0xcc6db610, 0x4094d8a3}, - /* 243 */ {4, 0.1261859507142915, 0xcfd41b91, 0x3b563c24}, - /* 244 */ {4, 0.1260916806894653, 0xd3455100, 0x3632f7a5}, - /* 245 */ {4, 0.1259979361142023, 0xd6c16d31, 0x312a60c3}, - /* 246 */ {4, 0.1259047118299582, 0xda488710, 0x2c3bd1f0}, - /* 247 */ {4, 0.1258120027502338, 0xdddab5a1, 0x2766aa45}, - /* 248 */ {4, 0.1257198038592741, 0xe1781000, 0x22aa4d5f}, - /* 249 */ {4, 0.1256281102107963, 0xe520ad61, 0x1e06233c}, - /* 250 */ {4, 0.1255369169267456, 0xe8d4a510, 0x19799812}, - /* 251 */ {4, 0.1254462191960791, 0xec940e71, 0x15041c33}, - /* 252 */ {4, 0.1253560122735751, 0xf05f0100, 0x10a523e5}, - /* 253 */ {4, 0.1252662914786691, 0xf4359451, 0xc5c2749}, - /* 254 */ {4, 0.1251770521943144, 0xf817e010, 0x828a237}, - /* 255 */ {4, 0.1250882898658681, 0xfc05fc01, 0x40a1423}, - /* 256 */ {4, 0.1250000000000000, 0x8, 0x0}, -}; - -static void prtmpw(const char * msg, mpwObject * x) - /*@global stderr, fileSystem @*/ - /*@modifies stderr, fileSystem @*/ -{ -fprintf(stderr, "%5.5s %p[%d]:\t", msg, MPW_DATA(x), MPW_SIZE(x)), mpfprintln(stderr, MPW_SIZE(x), MPW_DATA(x)); -} - -static size_t -mpsizeinbase(size_t xsize, mpw* xdata, size_t base) - /*@*/ -{ - size_t nbits; - size_t res; - - if (xsize == 0) - return 1; - - /* XXX assumes positive integer. */ - nbits = MP_WORDS_TO_BITS(xsize) - mpmszcnt(xsize, xdata); - if ((base & (base-1)) == 0) { /* exact power of 2 */ - size_t lbits = mp_bases[base].big_base; - res = (nbits + (lbits - 1)) / lbits; - } else { - res = (nbits * mp_bases[base].chars_per_bit_exactly) + 1; - } -if (_mpw_debug < -1) -fprintf(stderr, "*** mpsizeinbase(%p[%d], %d) res %u\n", xdata, xsize, base, (unsigned)res); - return res; -} - -#ifdef DYING -/*@-boundswrite@*/ -static void myndivmod(mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw* ydata, register mpw* workspace) -{ - /* result must be xsize+1 in length */ - /* workspace must be ysize+1 in length */ - /* expect ydata to be normalized */ - mpw q; - mpw msw = *ydata; - size_t qsize = xsize-ysize; - - *result = (mpge(ysize, xdata, ydata) ? 1 : 0); - mpcopy(xsize, result+1, xdata); - if (*result) - (void) mpsub(ysize, result+1, ydata); - result++; - - while (qsize--) - { - q = mppndiv(result[0], result[1], msw); - -/*@-evalorder@*/ - *workspace = mpsetmul(ysize, workspace+1, ydata, q); -/*@=evalorder@*/ - - while (mplt(ysize+1, result, workspace)) - { - (void) mpsubx(ysize+1, workspace, ysize, ydata); - q--; - } - (void) mpsub(ysize+1, result, workspace); - *(result++) = q; - } -} -/*@=boundswrite@*/ -#endif - -static char * -mpstr(char * t, size_t nt, size_t size, mpw* data, mpw base) - /*@modifies t @*/ -{ - static char bchars[] = "0123456789abcdefghijklmnopqrstuvwxyz"; - size_t asize = size + 1; - mpw* adata = alloca(asize * sizeof(*adata)); - size_t anorm; - mpw* zdata = alloca((asize+1) * sizeof(*zdata)); - mpw* wksp = alloca((1+1) * sizeof(*wksp)); - size_t result; - -if (_mpw_debug < -1) -fprintf(stderr, "*** mpstr(%p[%d], %p[%d], %d):\t", t, nt, data, size, base), mpfprintln(stderr, size, data); - - mpsetx(asize, adata, size, data); - - t[nt] = '\0'; - while (nt--) { - - mpndivmod(zdata, asize, adata, 1, &base, wksp); - -if (_mpw_debug < -1) { -fprintf(stderr, " a %p[%d]:\t", adata, asize), mpfprintln(stderr, asize, adata); -fprintf(stderr, " z %p[%d]:\t", zdata, asize+1), mpfprintln(stderr, asize+1, zdata); -} - result = zdata[asize]; - t[nt] = bchars[result]; - - if (mpz(asize, zdata)) - break; - - anorm = asize - mpsize(asize, zdata); - if (anorm < asize) - asize -= anorm; - mpsetx(asize+1, adata, asize, zdata+anorm); - asize++; - } - /* XXX Fill leading zeroes (if any). */ - while (nt--) - t[nt] = '0'; - return t; -} - -static PyObject * -mpw_format(mpwObject * z, size_t base, int addL) - /*@modifies t @*/ -{ - size_t zsize = MPW_SIZE(z); - mpw* zdata = MPW_DATA(z); - PyStringObject * so; - size_t i; - size_t nt; - size_t size; - mpw* data; - char * t, * te; - char prefix[5]; - char * tcp = prefix; - int sign; - - if (z == NULL || !mpw_Check(z)) { - PyErr_BadInternalCall(); - return NULL; - } - -if (_mpw_debug < -1) -fprintf(stderr, "*** mpw_format(%p,%d,%d):\t", z, base, addL), mpfprintln(stderr, zsize, zdata); - - assert(base >= 2 && base <= 36); - - i = 0; - if (addL && initialiser_name != NULL) - i = strlen(initialiser_name) + 2; /* e.g. 'mpw(' + ')' */ - - sign = z->ob_size; - nt = MPBITCNT(zsize, zdata); - if (nt == 0) { - base = 10; /* '0' in every base, right */ - nt = 1; - size = 1; - data = alloca(size * sizeof(*data)); - *data = 0; - } else if (sign < 0) { - *tcp++ = '-'; - i += 1; /* space to hold '-' */ - size = MP_ROUND_B2W(nt); - data = zdata + (zsize - size); - } else { - size = MP_ROUND_B2W(nt); - data = zdata + (zsize - size); - } - - if (addL && size > 1) - i++; /* space for 'L' suffix */ - - nt = mpsizeinbase(size, data, base); - i += nt; - - if (base == 16) { - *tcp++ = '0'; - *tcp++ = 'x'; - i += 2; /* space to hold '0x' */ - } else if (base == 8) { - *tcp++ = '0'; - i += 1; /* space to hold the extra '0' */ - } else if (base > 10) { - *tcp++ = '0' + base / 10; - *tcp++ = '0' + base % 10; - *tcp++ = '#'; - i += 3; /* space to hold e.g. '12#' */ - } else if (base < 10) { - *tcp++ = '0' + base; - *tcp++ = '#'; - i += 2; /* space to hold e.g. '6#' */ - } - - so = (PyStringObject *)PyString_FromStringAndSize((char *)0, i); - if (so == NULL) - return NULL; - - /* get the beginning of the string memory and start copying things */ - te = PyString_AS_STRING(so); - if (addL && initialiser_name != NULL && *initialiser_name != '\0') { - te = stpcpy(te, initialiser_name); - *te++ = '('; /*')'*/ - } - - /* copy the already prepared prefix; e.g. sign and base indicator */ - *tcp = '\0'; - t = te = stpcpy(te, prefix); - - (void) mpstr(te, nt, size, data, base); - - /* Nuke leading zeroes. */ - nt = 0; - while (t[nt] == '0') - nt++; - if (t[nt] == '\0') /* all zeroes special case. */ - nt--; - if (nt > 0) - do { - *t = t[nt]; - } while (*t++ != '\0'); - - te += strlen(te); - - if (addL) { - if (size > 1) - *te++ = 'L'; - if (initialiser_name != NULL && *initialiser_name != '\0') - *te++ = /*'('*/ ')'; - } - *te = '\0'; - - assert(te - PyString_AS_STRING(so) <= i); - - if (te - PyString_AS_STRING(so) != i) - so->ob_size -= i - (te - PyString_AS_STRING(so)); - - return (PyObject *)so; -} - -/** - * Precomputes the sliding window table for computing powers of x. - * - * Sliding Window Exponentiation, Algorithm 14.85 in "Handbook of Applied Cryptography". - * - * First of all, the table with the powers of g can be reduced by - * about half; the even powers don't need to be accessed or stored. - * - * Get up to K bits starting with a one, if we have that many still available. - * - * Do the number of squarings of A in the first column, then multiply by - * the value in column two, and finally do the number of squarings in - * column three. - * - * This table can be used for K=2,3,4 and can be extended. - * - * -\verbatim - 0 : - | - | - - 1 : 1 | g1 @ 0 | 0 - 10 : 1 | g1 @ 0 | 1 - 11 : 2 | g3 @ 1 | 0 - 100 : 1 | g1 @ 0 | 2 - 101 : 3 | g5 @ 2 | 0 - 110 : 2 | g3 @ 1 | 1 - 111 : 3 | g7 @ 3 | 0 - 1000 : 1 | g1 @ 0 | 3 - 1001 : 4 | g9 @ 4 | 0 - 1010 : 3 | g5 @ 2 | 1 - 1011 : 4 | g11 @ 5 | 0 - 1100 : 2 | g3 @ 1 | 2 - 1101 : 4 | g13 @ 6 | 0 - 1110 : 3 | g7 @ 3 | 1 - 1111 : 4 | g15 @ 7 | 0 -\endverbatim - * - */ -static void mpslide(size_t xsize, const mpw* xdata, - size_t size, /*@out@*/ mpw* slide) - /*@modifies slide @*/ -{ - size_t rsize = (xsize > size ? xsize : size); - mpw* result = alloca(2 * rsize * sizeof(*result)); - - mpsqr(result, xsize, xdata); /* x^2 temp */ - mpsetx(size, slide, xsize+xsize, result); -if (_mpw_debug < 0) -fprintf(stderr, "\t x^2:\t"), mpfprintln(stderr, size, slide); - mpmul(result, xsize, xdata, size, slide); /* x^3 */ - mpsetx(size, slide+size, xsize+size, result); -if (_mpw_debug < 0) -fprintf(stderr, "\t x^3:\t"), mpfprintln(stderr, size, slide+size); - mpmul(result, size, slide, size, slide+size); /* x^5 */ - mpsetx(size, slide+2*size, size+size, result); -if (_mpw_debug < 0) -fprintf(stderr, "\t x^5:\t"), mpfprintln(stderr, size, slide+2*size); - mpmul(result, size, slide, size, slide+2*size); /* x^7 */ - mpsetx(size, slide+3*size, size+size, result); -if (_mpw_debug < 0) -fprintf(stderr, "\t x^7:\t"), mpfprintln(stderr, size, slide+3*size); - mpmul(result, size, slide, size, slide+3*size); /* x^9 */ - mpsetx(size, slide+4*size, size+size, result); -if (_mpw_debug < 0) -fprintf(stderr, "\t x^9:\t"), mpfprintln(stderr, size, slide+4*size); - mpmul(result, size, slide, size, slide+4*size); /* x^11 */ - mpsetx(size, slide+5*size, size+size, result); -if (_mpw_debug < 0) -fprintf(stderr, "\t x^11:\t"), mpfprintln(stderr, size, slide+5*size); - mpmul(result, size, slide, size, slide+5*size); /* x^13 */ - mpsetx(size, slide+6*size, size+size, result); -if (_mpw_debug < 0) -fprintf(stderr, "\t x^13:\t"), mpfprintln(stderr, size, slide+6*size); - mpmul(result, size, slide, size, slide+6*size); /* x^15 */ - mpsetx(size, slide+7*size, size+size, result); -if (_mpw_debug < 0) -fprintf(stderr, "\t x^15:\t"), mpfprintln(stderr, size, slide+7*size); - mpsetx(size, slide, xsize, xdata); /* x^1 */ -if (_mpw_debug < 0) -fprintf(stderr, "\t x^1:\t"), mpfprintln(stderr, size, slide); -} - -/*@observer@*/ /*@unchecked@*/ -static byte mpslide_presq[16] = -{ 0, 1, 1, 2, 1, 3, 2, 3, 1, 4, 3, 4, 2, 4, 3, 4 }; - -/*@observer@*/ /*@unchecked@*/ -static byte mpslide_mulg[16] = -{ 0, 0, 0, 1, 0, 2, 1, 3, 0, 4, 2, 5, 1, 6, 3, 7 }; - -/*@observer@*/ /*@unchecked@*/ -static byte mpslide_postsq[16] = -{ 0, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 }; - -/** - * Exponentiation with precomputed sliding window table. - */ -/*@-boundsread@*/ -static void mpnpowsld_w(mpnumber* n, size_t size, const mpw* slide, - size_t psize, const mpw* pdata) - /*@modifies n @*/ -{ - size_t rsize = (n->size > size ? n->size : size); - mpw* rdata = alloca(2 * rsize * sizeof(*rdata)); - short lbits = 0; - short kbits = 0; - byte s; - mpw temp; - short count; - -if (_mpw_debug < 0) -fprintf(stderr, "npowsld: p\t"), mpfprintln(stderr, psize, pdata); - /* 2. A = 1, i = t. */ - mpzero(n->size, n->data); - n->data[n->size-1] = 1; - - /* Find first bit set in exponent. */ - temp = *pdata; - count = 8 * sizeof(temp); - while (count != 0) { - if (temp & MP_MSBMASK) - break; - temp <<= 1; - count--; - } - - while (psize) { - while (count != 0) { - - /* Shift next bit of exponent into sliding window. */ - kbits <<= 1; - if (temp & MP_MSBMASK) - kbits++; - - /* On 1st non-zero in window, try to collect K bits. */ - if (kbits != 0) { - if (lbits != 0) - lbits++; - else if (temp & MP_MSBMASK) - lbits = 1; - else - {}; - - /* If window is full, then compute and clear window. */ - if (lbits == 4) { -if (_mpw_debug < 0) -fprintf(stderr, "*** #1 lbits %d kbits %d\n", lbits, kbits); - for (s = mpslide_presq[kbits]; s > 0; s--) { - mpsqr(rdata, n->size, n->data); - mpsetx(n->size, n->data, 2*n->size, rdata); -if (_mpw_debug < 0) -fprintf(stderr, "\t pre1:\t"), mpfprintln(stderr, n->size, n->data); - } - - mpmul(rdata, n->size, n->data, - size, slide+mpslide_mulg[kbits]*size); - mpsetx(n->size, n->data, n->size+size, rdata); -if (_mpw_debug < 0) -fprintf(stderr, "\t mul1:\t"), mpfprintln(stderr, n->size, n->data); - - for (s = mpslide_postsq[kbits]; s > 0; s--) { - mpsqr(rdata, n->size, n->data); - mpsetx(n->size, n->data, 2*n->size, rdata); -if (_mpw_debug < 0) -fprintf(stderr, "\tpost1:\t"), mpfprintln(stderr, n->size, n->data); - } - - lbits = kbits = 0; - } - } else { - mpsqr(rdata, n->size, n->data); - mpsetx(n->size, n->data, 2*n->size, rdata); -if (_mpw_debug < 0) -fprintf(stderr, "\t sqr:\t"), mpfprintln(stderr, n->size, n->data); - } - - temp <<= 1; - count--; - } - if (--psize) { - count = 8 * sizeof(temp); - temp = *(pdata++); - } - } - - if (kbits != 0) { -if (_mpw_debug < 0) -fprintf(stderr, "*** #1 lbits %d kbits %d\n", lbits, kbits); - for (s = mpslide_presq[kbits]; s > 0; s--) { - mpsqr(rdata, n->size, n->data); - mpsetx(n->size, n->data, 2*n->size, rdata); -if (_mpw_debug < 0) -fprintf(stderr, "\t pre2:\t"), mpfprintln(stderr, n->size, n->data); - } - - mpmul(rdata, n->size, n->data, - size, slide+mpslide_mulg[kbits]*size); - mpsetx(n->size, n->data, n->size+size, rdata); -if (_mpw_debug < 0) -fprintf(stderr, "\t mul2:\t"), mpfprintln(stderr, n->size, n->data); - - for (s = mpslide_postsq[kbits]; s > 0; s--) { - mpsqr(rdata, n->size, n->data); - mpsetx(n->size, n->data, 2*n->size, rdata); -if (_mpw_debug < 0) -fprintf(stderr, "\tpost2:\t"), mpfprintln(stderr, n->size, n->data); - } - } -} -/*@=boundsread@*/ - -/** - * mpnpow_w - * - * Uses sliding window exponentiation; needs extra storage: - * if K=3, needs 4*size, if K=4, needs 8*size - */ -/*@-boundsread@*/ -static void mpnpow_w(mpnumber* n, size_t xsize, const mpw* xdata, - size_t psize, const mpw* pdata) - /*@modifies n @*/ -{ - size_t xbits = MPBITCNT(xsize, xdata); - size_t pbits = MPBITCNT(psize, pdata); - size_t nbits; - mpw *slide; - size_t nsize; - size_t size; - - /* Special case: 0**P and X**(-P) */ - if (xbits == 0 || (psize > 0 && mpmsbset(psize, pdata))) { - mpnsetw(n, 0); - return; - } - /* Special case: X**0 and 1**P */ - if (pbits == 0 || mpisone(xsize, xdata)) { - mpnsetw(n, 1); - return; - } - - /* Normalize (to mpw boundary) exponent. */ - pdata += psize - MP_ROUND_B2W(pbits); - psize -= MP_BITS_TO_WORDS(pbits); - - /* Calculate size of result. */ - if (xbits == 0) xbits = 1; - nbits = (*pdata) * xbits; - nsize = MP_ROUND_B2W(nbits); - - /* XXX Add 1 word to carry sign bit */ - if (!mpmsbset(xsize, xdata) && (nbits & (MP_WBITS - 1)) == 0) - nsize++; - - size = MP_ROUND_B2W(15 * xbits); - -if (_mpw_debug < 0) -fprintf(stderr, "*** pbits %d xbits %d nsize %d size %d\n", pbits, xbits, nsize, size); - mpnsize(n, nsize); - - /* 1. Precompute odd powers of x (up to 2**K). */ - slide = (mpw*) alloca( (8*size) * sizeof(mpw)); - - mpslide(xsize, xdata, size, slide); - - /*@-internalglobs -mods@*/ /* noisy */ - mpnpowsld_w(n, size, slide, psize, pdata); - /*@=internalglobs =mods@*/ - -} -/*@=boundsread@*/ - -/* ---------- */ - -mpwObject * -mpw_New(int ob_size) - /*@*/ -{ - size_t size = ABS(ob_size); - mpwObject * z; - - /* XXX Make sure that 0 has allocated space. */ - if (size == 0) - size++; - z = PyObject_NEW_VAR(mpwObject, &mpw_Type, size); - if (z == NULL) - return NULL; - - z->ob_size = ob_size; - - if (size > 0) - memset(&z->data, 0, size * sizeof(*z->data)); - - return z; -} - -static mpwObject * -mpw_Copy(mpwObject *a) - /*@*/ -{ - mpwObject * z; - - z = mpw_FromMPW(MPW_SIZE(a), MPW_DATA(a), 1); - if (z != NULL) - z->ob_size = a->ob_size; - return z; -} - -static mpwObject * -mpw_FromLong(long ival) - /*@*/ -{ - mpwObject * z = mpw_New(1); - - if (z == NULL) - return NULL; - - if (ival < 0) { - z->ob_size = -z->ob_size; - ival = -ival; - } - z->data[0] = (mpw) ival; - - return z; -} - -static mpwObject * -mpw_FromDouble(double dval) -{ - mpwObject * z = mpw_New(1); - - if (z == NULL) - return NULL; - - if (dval < 0) { - z->ob_size = -z->ob_size; - dval = -dval; - } - z->data[0] = (mpw) dval; - - return z; -} - -#ifdef NOTYET -static mpwObject * -mpw_FromString(const char * str, char ** sep, int base) - /*@*/ -{ - const char * s = str, * se; - mpwObject * z = NULL; - mpw zbase, zval; - int sign = 1; - int ndigits; - - if ((base != 0 && base < 2) || base > 36) { - PyErr_SetString(PyExc_ValueError, "mpw() arg 2 must be >= 2 and <= 36"); - return NULL; - } - while (*s != '\0' && isspace(Py_CHARMASK(*s))) - s++; - if (*s == '+') - ++s; - else if (*s == '-') { - ++s; - sign = -1; - } - while (*s != '\0' && isspace(Py_CHARMASK(*s))) - s++; - if (base == 0) { - if (s[0] != '0') - base = 10; - else if (s[1] == 'x' || s[1] == 'X') - base = 16; - else - base = 8; - } - if (base == 16 && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) - s += 2; - - /* Validate characters as digits of base. */ - for (se = s; *se != '\0'; se++) { - int k; - - if (*se <= '9') - k = *se - '0'; - else if (*se >= 'a') - k = *se - 'a' + 10; - else if (*se >= 'A') - k = *se - 'A' + 10; - else - k = -1; - if (k < 0 || k >= base) - break; - } - if (se == s) - goto onError; - - ndigits = (se - s); - - if (*se == 'L' || *se == 'l') - se++; - while (*se && isspace(Py_CHARMASK(*se))) - se++; - if (sep) - *sep = se; - if (*se != '\0') - goto onError; - - /* Allocate mpw. */ - - /* Convert digit string. */ - zbase = base; - for (se = s; *se != '\0'; se++) { - if (*se <= '9') - zval = *se - '0'; - else if (*se >= 'a') - zval = *se - 'a' + 10; - else if (*se >= 'A') - zval = *se - 'A' + 10; - } - - if (sign < 0 && z != NULL && z->ob_size != 0) - z->ob_size = -(z->ob_size); - - return z; - -onError: - PyErr_Format(PyExc_ValueError, "invalid literal for mpw(): %.200s", str); - Py_XDECREF(z); - return NULL; -} -#endif - -static mpwObject * -mpw_FromHEX(const char * hex) - /*@*/ -{ - size_t len = strlen(hex); - size_t size = MP_NIBBLES_TO_WORDS(len + MP_WNIBBLES - 1); - mpwObject * z = mpw_New(size); - - if (z != NULL && size > 0) - hs2ip(MPW_DATA(z), size, hex, len); - - return z; -} - -mpwObject * -mpw_FromMPW(size_t size, mpw* data, int normalize) -{ - mpwObject * z; - - if (normalize) { - size_t norm = size - MP_ROUND_B2W(MPBITCNT(size, data)); - if (norm > 0 && norm < size) { - size -= norm; - data += norm; - } - } - - z = mpw_New(size); - if (z == NULL) - return NULL; - - if (size > 0) - memcpy(&z->data, data, size * sizeof(*z->data)); - - return z; -} - -static mpwObject * -mpw_FromLongObject(PyLongObject *lo) - /*@*/ -{ - mpwObject * z; - int lsize = ABS(lo->ob_size); - int lbits = DIGITS_TO_BITS(lsize); - size_t zsize = MP_BITS_TO_WORDS(lbits) + 1; - mpw* zdata; - unsigned char * zb; - size_t nzb; - int is_littleendian = 0; - int is_signed = 0; - - lsize = zsize; - if (lo->ob_size < 0) - lsize = -lsize; - z = mpw_New(lsize); - if (z == NULL) - return NULL; - - zdata = MPW_DATA(z); - zb = (unsigned char *) zdata; - nzb = MP_WORDS_TO_BYTES(zsize); - - /* Grab long as big-endian unsigned octets. */ - if (_PyLong_AsByteArray(lo, zb, nzb, is_littleendian, is_signed)) { - Py_DECREF(z); - return NULL; - } - - /* Endian swap zdata's mpw elements. */ - if (IS_LITTLE_ENDIAN()) { - mpw w = 0; - int zx = 0; - while (nzb) { - w <<= 8; - w |= *zb++; - nzb--; - if ((nzb % MP_WBYTES) == 0) { - zdata[zx++] = w; - w = 0; - } - } - } - - return z; -} - -/* ---------- */ - -static void -mpw_dealloc(/*@only@*/mpwObject * s) - /*@modifies s @*/ -{ -if (_mpw_debug < -1) -fprintf(stderr, "*** mpw_dealloc(%p[%s])\n", s, lbl(s)); - - PyObject_Del(s); -} - -static int -mpw_compare(mpwObject * a, mpwObject * b) - /*@*/ -{ - size_t asize = MPW_SIZE(a); - mpw* adata = MPW_DATA(a); - size_t bsize = MPW_SIZE(b); - mpw* bdata = MPW_DATA(b); - int ret; - - if (mpeqx(asize, adata, bsize, bdata)) - ret = 0; - else if (mpgtx(asize, adata, bsize, bdata)) - ret = 1; - else - ret = -1; - -if (_mpw_debug) -fprintf(stderr, "*** mpw_compare(%p[%s],%p[%s]) ret %d\n", a, lbl(a), b, lbl(b), ret); - return ret; -} - -static PyObject * -mpw_repr(mpwObject * a) - /*@*/ -{ - PyObject * so = mpw_format(a, 10, 1); -if (_mpw_debug && so != NULL) -fprintf(stderr, "*** mpw_repr(%p): \"%s\"\n", a, PyString_AS_STRING(so)); - return so; -} - -/** \ingroup py_c - */ -static PyObject * -mpw_str(mpwObject * a) - /*@*/ -{ - PyObject * so = mpw_format(a, 10, 0); -if (so != NULL && _mpw_debug < -1) -fprintf(stderr, "*** mpw_str(%p): \"%s\"\n", a, PyString_AS_STRING(so)); - return so; -} - -#ifdef DYING -/** \ingroup py_c - */ -static int mpw_init(mpwObject * z, PyObject *args, PyObject *kwds) - /*@modifies s @*/ -{ - PyObject * o = NULL; - long l = 0; - - if (!PyArg_ParseTuple(args, "|O:Cvt", &o)) return -1; - - if (o == NULL) { - mpnsetw(&z->n, l); - } else if (PyInt_Check(o)) { - l = PyInt_AsLong(o); - mpnsetw(&z->n, l); - } else if (PyLong_Check(o)) { - PyLongObject *lo = (PyLongObject *)o; - int lsize = ABS(lo->ob_size); - int lbits = DIGITS_TO_BITS(lsize); - size_t zsize = MP_BITS_TO_WORDS(lbits) + 1; - mpw* zdata = alloca(zsize * sizeof(*zdata)); - unsigned char * zb = (unsigned char *) zdata; - size_t nzb = MP_WORDS_TO_BYTES(zsize); - int is_littleendian = 0; - int is_signed = 1; - - /* Grab long as big-endian signed octets. */ - if (_PyLong_AsByteArray(lo, zb, nzb, is_littleendian, is_signed)) - return -1; - - /* Endian swap zdata's mpw elements. */ - if (IS_LITTLE_ENDIAN()) { - mpw w = 0; - int zx = 0; - while (nzb) { - w <<= 8; - w |= *zb++; - nzb--; - if ((nzb % MP_WBYTES) == 0) { - zdata[zx++] = w; - w = 0; - } - } - } - mpnset(&z->n, zsize, zdata); - } else if (PyFloat_Check(o)) { - double d = PyFloat_AsDouble(o); - /* XXX TODO: check for overflow/underflow. */ - l = (long) (d + 0.5); - mpnsetw(&z->n, l); - } else if (PyString_Check(o)) { - const unsigned char * hex = PyString_AsString(o); - /* XXX TODO: check for hex. */ - mpnsethex(&z->n, hex); - } else if (mpw_Check(o)) { - mpwObject *a = (mpwObject *)o; - mpncopy(&z->n, &a->n); - } else { - PyErr_SetString(PyExc_TypeError, "non-numeric coercion failed (mpw_init)"); - return -1; - } - -if (_mpw_debug) -fprintf(stderr, "*** mpw_init(%p[%s],%p[%s],%p[%s]):\t", z, lbl(z), args, lbl(args), kwds, lbl(kwds)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z)); - - return 0; -} -#endif - -/** \ingroup py_c - */ -static void mpw_free(/*@only@*/ mpwObject * s) - /*@modifies s @*/ -{ -if (_mpw_debug) -fprintf(stderr, "*** mpw_free(%p[%s])\n", s, lbl(s)); - PyObject_Del(s); -} - -/** \ingroup py_c - * Convert integer to mpw. - */ -static mpwObject * -mpw_i2mpw(PyObject * o) - /*@modifies o @*/ -{ - if (mpw_Check(o)) { - Py_INCREF(o); - return (mpwObject *)o; - } - if (PyInt_Check(o)) - return mpw_FromLong(PyInt_AsLong(o)); - else if (PyLong_Check(o)) - return mpw_FromLongObject((PyLongObject *)o); - else if (PyFloat_Check(o)) - return mpw_FromDouble(PyFloat_AsDouble(o)); - else if (PyString_Check(o)) - return mpw_FromHEX(PyString_AS_STRING(o)); - - PyErr_SetString(PyExc_TypeError, "number coercion (to mpwObject) failed"); - return NULL; -} - -static PyObject * -mpw_new(PyTypeObject *type, PyObject *args, PyObject *kwds) - /*@*/ -{ - mpwObject *z; - - if (type != &mpw_Type) { - mpwObject *tz; - size_t size; - - assert(PyType_IsSubtype(type, &mpw_Type)); - tz = (mpwObject *)mpw_new(&mpw_Type, args, kwds); - if (tz == NULL) - return NULL; - - size = ABS(tz->ob_size); - z = (mpwObject *) type->tp_alloc(type, size); - if (z == NULL) - return NULL; - - z->ob_size = tz->ob_size; - if (size > 0) - memcpy(&z->data, &tz->data, size * sizeof(*z->data)); - Py_DECREF(tz); - } else { - PyObject * x = NULL; - int base = -909; - static char *kwlist[] = {"x", "base", 0}; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oi:mpw", kwlist, &x, &base)) - return NULL; - - if (x != NULL) { - /* XXX make sure new instance, not old reference. */ - if (mpw_Check(x)) { - mpwObject *zo = (mpwObject *)x; - z = mpw_Copy(zo); - } else - z = mpw_i2mpw(x); - } else - z = mpw_FromLong(0); - } - -if (_mpw_debug < -1) -fprintf(stderr, "*** mpw_new(%p[%s],%p[%s],%p[%s])\t", type, lbl(type), args, lbl(args), kwds, lbl(kwds)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z)); - - return (PyObject *)z; -} - -/** \ingroup py_c - * Compute 2 argument operations. - */ -static PyObject * -mpw_ops2(const char *fname, char op, mpwObject *x, mpwObject *m) - /*@*/ -{ - mpwObject * z = NULL; - size_t xsize; - mpw* xdata; - size_t msize; - mpw* mdata; - size_t mnorm; - size_t asize; - mpw* adata; - size_t bsize; - mpw* bdata; - size_t shift; - size_t zsize; - mpw* zdata; - mpw* wksp; - mpbarrett b; - int carry; - int zsign = 0; - - mpbzero(&b); - if (x == NULL || m == NULL) - goto exit; - - xsize = MPW_SIZE(x); - xdata = MPW_DATA(x); - msize = MPW_SIZE(m); - mdata = MPW_DATA(m); - mnorm = msize - mpsize(msize, mdata); - if (mnorm > 0 && mnorm < msize) { - msize -= mnorm; - mdata += mnorm; - } - -if (_mpw_debug < 0) { -prtmpw("a", x); -prtmpw("b", m); -} - - switch (op) { - default: - goto exit; - /*@notreached@*/ break; - case '+': - zsize = MAX(xsize, msize) + 1; - zdata = alloca(zsize * sizeof(*zdata)); - mpsetx(zsize, zdata, xsize, xdata); - if (x->ob_size < 0) { - zsign = 1; - if (m->ob_size < 0) { - carry = mpaddx(zsize-1, zdata+1, msize, mdata); - if (carry) { -if (_mpw_debug) -fprintf(stderr, "add --: carry\n"); - *zdata = 1; - } - } else { - carry = mpsubx(zsize-1, zdata+1, msize, mdata); - if (carry) { -if (_mpw_debug) -fprintf(stderr, "add -+: borrow\n"); - *zdata = MP_ALLMASK; - mpneg(zsize, zdata); - zsign = 0; - } - } - } else { - zsign = 0; - if (m->ob_size < 0) { - carry = mpsubx(zsize-1, zdata+1, msize, mdata); - if (carry) { -if (_mpw_debug) -fprintf(stderr, "add +-: borrow\n"); - *zdata = MP_ALLMASK; - mpneg(zsize, zdata); - zsign = 1; - } - } else { - carry = mpaddx(zsize-1, zdata+1, msize, mdata); - if (carry) { -if (_mpw_debug) -fprintf(stderr, "add ++: carry\n"); - *zdata = 1; - } - } - } - z = mpw_FromMPW(zsize, zdata, 1); - if (zsign) - z->ob_size = -z->ob_size; - break; - case '-': - zsize = MAX(xsize, msize) + 1; - zdata = alloca(zsize * sizeof(*zdata)); - mpsetx(zsize, zdata, xsize, xdata); - if (x->ob_size < 0) { - zsign = 1; - if (m->ob_size < 0) { - carry = mpsubx(zsize-1, zdata+1, msize, mdata); - if (carry) { -if (_mpw_debug) -fprintf(stderr, "sub --: borrow\n"); - *zdata = MP_ALLMASK; - mpneg(zsize, zdata); - zsign = 0; - } - } else { - carry = mpaddx(zsize-1, zdata+1, msize, mdata); - if (carry) { -if (_mpw_debug) -fprintf(stderr, "sub -+: carry\n"); - *zdata = 1; - } - } - } else { - zsign = 0; - if (m->ob_size < 0) { - carry = mpaddx(zsize-1, zdata+1, msize, mdata); - if (carry) { -if (_mpw_debug) -fprintf(stderr, "sub +-: carry\n"); - *zdata = 1; - } - } else { - carry = mpsubx(zsize-1, zdata+1, msize, mdata); - if (carry) { -if (_mpw_debug) -fprintf(stderr, "sub ++: borrow\n"); - *zdata = MP_ALLMASK; - mpneg(zsize, zdata); - zsign = 1; - } - } - } - z = mpw_FromMPW(zsize-1, zdata+1, 1); - if (zsign) - z->ob_size = -z->ob_size; - break; - case '*': - zsize = xsize + msize; - zdata = alloca(zsize * sizeof(*zdata)); - zsign = x->ob_size * m->ob_size; - mpmul(zdata, xsize, xdata, msize, mdata); - z = mpw_FromMPW(zsize, zdata, 1); - if (zsign < 0) - z->ob_size = -z->ob_size; - break; - case '/': - asize = xsize+1; - adata = alloca(asize * sizeof(*adata)); - mpsetx(asize, adata, xsize, xdata); - bsize = msize; - bdata = alloca(bsize * sizeof(*bdata)); - mpsetx(bsize, bdata, msize, mdata); - - zsize = asize + 1; - zdata = alloca(zsize * sizeof(*zdata)); - zsign = x->ob_size * m->ob_size; - wksp = alloca((bsize+1) * sizeof(*wksp)); - - shift = mpnorm(bsize, bdata); - mplshift(asize, adata, shift); - mpndivmod(zdata, asize, adata, bsize, bdata, wksp); - - zsize -= bsize; - - if (zsign < 0) - (void) mpaddw(zsize, zdata, (mpw)1); - - z = mpw_FromMPW(zsize, zdata, 1); - if (zsign < 0) - z->ob_size = -z->ob_size; - break; - case '%': - asize = xsize+1; - adata = alloca(asize * sizeof(*adata)); - mpsetx(asize, adata, xsize, xdata); - bsize = msize; - bdata = mdata; - - zsize = asize; - zdata = alloca(zsize * sizeof(*zdata)); - zsign = x->ob_size * m->ob_size; - wksp = alloca((bsize+1) * sizeof(*wksp)); - - mpnmod(zdata, asize, adata, bsize, bdata, wksp); - - if (zsign < 0) { - if (m->ob_size < 0) { - (void) mpsubx(zsize, zdata, bsize, bdata); - mpneg(zsize, zdata); - } else { - zsign = 0; - mpneg(zsize, zdata); - (void) mpaddx(zsize, zdata, bsize, bdata); - } - } - z = mpw_FromMPW(zsize, zdata, 1); - if (zsign < 0) { - z->ob_size = -z->ob_size; - } else if (zsign > 0) { - if (x->ob_size < 0) - z->ob_size = -z->ob_size; - } - break; - case '<': - /* XXX FIXME: enlarge? negative count? sign?. */ - shift = (size_t) (msize == 1 ? mdata[0] : 0); - z = mpw_FromMPW(xsize, xdata, 0); - if (shift > 0) - mplshift(MPW_SIZE(z), MPW_DATA(z), shift); - break; - case '>': - /* XXX FIXME: enlarge? negative count? sign?. */ - shift = (size_t) (msize == 1 ? mdata[0] : 0); - z = mpw_FromMPW(xsize, xdata, 0); - if (shift > 0) - mprshift(MPW_SIZE(z), MPW_DATA(z), shift); - break; - case '&': - /* XXX reset to original size for now. */ - msize = MPW_SIZE(m); - mdata = MPW_DATA(m); - if (xsize <= msize) { - z = mpw_FromMPW(xsize, xdata, 0); - mpand(MPW_SIZE(z), MPW_DATA(z), mdata + (msize - xsize)); - } else { - z = mpw_FromMPW(msize, mdata, 0); - mpand(MPW_SIZE(z), MPW_DATA(z), xdata + (xsize - msize)); - } - break; - case '|': - /* XXX reset to original size for now. */ - msize = MPW_SIZE(m); - mdata = MPW_DATA(m); - if (xsize <= msize) { - z = mpw_FromMPW(xsize, xdata, 0); - mpor(MPW_SIZE(z), MPW_DATA(z), mdata + (msize - xsize)); - } else { - z = mpw_FromMPW(msize, mdata, 0); - mpor(MPW_SIZE(z), MPW_DATA(z), xdata + (xsize - msize)); - } - break; - case '^': - /* XXX reset to original size for now. */ - msize = MPW_SIZE(m); - mdata = MPW_DATA(m); - if (xsize <= msize) { - z = mpw_FromMPW(xsize, xdata, 0); - mpxor(MPW_SIZE(z), MPW_DATA(z), mdata + (msize - xsize)); - } else { - z = mpw_FromMPW(msize, mdata, 0); - mpxor(MPW_SIZE(z), MPW_DATA(z), xdata + (xsize - msize)); - } - break; - case 'P': - { mpnumber zn; - - mpnzero(&zn); - if (msize == 0 || (msize == 1 && *mdata == 0)) - mpnsetw(&zn, 1); - else if (mpz(xsize, xdata) || m->ob_size < 0) - mpnsetw(&zn, 0); - else { - zsign = (x->ob_size > 0 || mpeven(msize, mdata)) ? 1 : -1; - mpnpow_w(&zn, xsize, xdata, msize, mdata); - } - z = mpw_FromMPW(zn.size, zn.data, 1); - mpnfree(&zn); - if (zsign < 0) - z->ob_size = -z->ob_size; - } break; - case 'G': - wksp = alloca((xsize) * sizeof(*wksp)); - z = mpw_New(msize); - mpgcd_w(xsize, xdata, mdata, MPW_DATA(z), wksp); - break; - case 'I': - wksp = alloca((7*msize+6)*sizeof(*wksp)); - z = mpw_New(msize); - (void) mpextgcd_w(msize, wksp, mdata, MPW_DATA(z), wksp+msize); - break; -#ifdef DYING - case 'R': - { rngObject * r = ((rngObject *)x); - - wksp = alloca(msize*sizeof(*wksp)); - mpbset(&b, msize, mdata); - z = mpw_New(msize); - mpbrnd_w(&b, &r->rngc, MPW_DATA(z), wksp); - } break; -#endif - case 'S': - wksp = alloca((4*msize+2)*sizeof(*wksp)); - mpbset(&b, msize, mdata); - z = mpw_New(msize); - mpbsqrmod_w(&b, xsize, xdata, MPW_DATA(z), wksp); - break; - } - -if (_mpw_debug) -fprintf(stderr, "*** mpw_%s %p[%d]\t", fname, MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z)); - -exit: - mpbfree(&b); - Py_XDECREF(x); - Py_XDECREF(m); - return (PyObject *)z; -} - -/** \ingroup py_c - * Compute 3 argument operations. - */ -static PyObject * -mpw_ops3(const char *fname, char op, - mpwObject *x, mpwObject *y, mpwObject *m) - /*@*/ -{ - mpwObject * z = NULL; - size_t xsize; - mpw* xdata; - size_t ysize; - mpw* ydata; - size_t msize; - mpw* mdata; - size_t zsize; - mpw* zdata; - mpbarrett b; - mpw* wksp; - - mpbzero(&b); - if (x == NULL || y == NULL || m == NULL) - goto exit; - -if (_mpw_debug < 0) { -prtmpw("a", x); -prtmpw("b", y); -prtmpw("c", m); -} - - xsize = MPW_SIZE(x); - xdata = MPW_DATA(x); - ysize = MPW_SIZE(y); - ydata = MPW_DATA(y); - msize = MPW_SIZE(m); - mdata = MPW_DATA(m); - - mpbset(&b, msize, mdata); - - zsize = b.size; - zdata = alloca(zsize * sizeof(*zdata)); - wksp = alloca((4*zsize+2)*sizeof(*wksp)); - - switch (op) { - case '/': - case '%': - default: - goto exit; - /*@notreached@*/ break; - case '+': - fname = "Addm"; - mpbaddmod_w(&b, xsize, xdata, ysize, ydata, zdata, wksp); - break; - case '-': - fname = "Subm"; - mpbsubmod_w(&b, xsize, xdata, ysize, ydata, zdata, wksp); - break; - case '*': - fname = "Mulm"; - mpbmulmod_w(&b, xsize, xdata, ysize, ydata, zdata, wksp); - break; - case 'P': - fname = "Powm"; - mpbpowmod_w(&b, xsize, xdata, ysize, ydata, zdata, wksp); - break; - } - - z = mpw_FromMPW(zsize, zdata, 1); - -if (_mpw_debug < 0) -fprintf(stderr, "*** mpw_%s %p[%d]\t", fname, MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z)); - -exit: - mpbfree(&b); - Py_XDECREF(x); - Py_XDECREF(y); - Py_XDECREF(m); - return (PyObject *)z; -} - -/* ---------- */ - -/** \ingroup py_c - */ -static PyObject * -mpw_Debug(/*@unused@*/ mpwObject * s, PyObject * args) - /*@globals _Py_NoneStruct @*/ - /*@modifies _Py_NoneStruct @*/ -{ - if (!PyArg_ParseTuple(args, "i:Debug", &_mpw_debug)) return NULL; - Py_INCREF(Py_None); - return Py_None; -} - -/** \ingroup py_c - * Compute gcd(x, y). - */ -static PyObject * -mpw_Gcd(mpwObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * mo; - - if (!PyArg_ParseTuple(args, "OO:Gcd", &xo, &mo)) return NULL; - return mpw_ops2("Gcd", 'G', mpw_i2mpw(xo), mpw_i2mpw(mo)); -} - -/** \ingroup py_c - * Compute inverse (modulo m) of x. - */ -static PyObject * -mpw_Invm(/*@unused@*/ mpwObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * mo; - - if (!PyArg_ParseTuple(args, "OO:Invm", &xo, &mo)) return NULL; - return mpw_ops2("Invm", 'I', mpw_i2mpw(xo), mpw_i2mpw(mo)); -} - -/** \ingroup py_c - * Compute x*x (modulo m). - */ -static PyObject * -mpw_Sqrm(mpwObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * mo; - - if (!PyArg_ParseTuple(args, "OO:Sqrm", &xo, &mo)) return NULL; - return mpw_ops2("Sqrm", 'S', mpw_i2mpw(xo), mpw_i2mpw(mo)); -} - -/** \ingroup py_c - * Compute x+y (modulo m). - */ -static PyObject * -mpw_Addm(mpwObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * yo, * mo; - - if (!PyArg_ParseTuple(args, "OOO:Addm", &xo, &yo, &mo)) return NULL; - return mpw_ops3("Addm", '+', - mpw_i2mpw(xo), mpw_i2mpw(yo), mpw_i2mpw(mo)); -} - -/** \ingroup py_c - * Compute x-y (modulo m). - */ -static PyObject * -mpw_Subm(mpwObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * yo, * mo; - - if (!PyArg_ParseTuple(args, "OOO:Subm", &xo, &yo, &mo)) return NULL; - return mpw_ops3("Subm", '-', - mpw_i2mpw(xo), mpw_i2mpw(yo), mpw_i2mpw(mo)); -} - -/** \ingroup py_c - * Compute x*y (modulo m). - */ -static PyObject * -mpw_Mulm(mpwObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * yo, * mo; - - if (!PyArg_ParseTuple(args, "OOO:Mulm", &xo, &yo, &mo)) return NULL; - return mpw_ops3("Mulm", '*', - mpw_i2mpw(xo), mpw_i2mpw(yo), mpw_i2mpw(mo)); -} - -/** \ingroup py_c - * Compute x**y (modulo m). - */ -static PyObject * -mpw_Powm(mpwObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * yo, * mo; - - if (!PyArg_ParseTuple(args, "OOO:Powm", &xo, &yo, &mo)) return NULL; - return mpw_ops3("Powm", 'P', - mpw_i2mpw(xo), mpw_i2mpw(yo), mpw_i2mpw(mo)); -} - -#ifdef DYNING -/** \ingroup py_c - * Return random number 1 < r < b-1. - */ -static PyObject * -mpw_Rndm(mpwObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * mo; - - if (!PyArg_ParseTuple(args, "OO:Rndm", &mo, &xo)) return NULL; - if (!is_rng(xo)) { - PyErr_SetString(PyExc_TypeError, "mpw.rndm() requires rng_Type argument"); - return NULL; - } - return mpw_ops2("Rndm", 'R', (mpwObject*)xo, mpw_i2mpw(mo)); -} -#endif - -/*@-fullinitblock@*/ -/*@unchecked@*/ /*@observer@*/ -static struct PyMethodDef mpw_methods[] = { - {"Debug", (PyCFunction)mpw_Debug, METH_VARARGS, - NULL}, - {"gcd", (PyCFunction)mpw_Gcd, METH_VARARGS, - NULL}, - {"invm", (PyCFunction)mpw_Invm, METH_VARARGS, - NULL}, - {"sqrm", (PyCFunction)mpw_Sqrm, METH_VARARGS, - NULL}, - {"addm", (PyCFunction)mpw_Addm, METH_VARARGS, - NULL}, - {"subm", (PyCFunction)mpw_Subm, METH_VARARGS, - NULL}, - {"mulm", (PyCFunction)mpw_Mulm, METH_VARARGS, - NULL}, - {"powm", (PyCFunction)mpw_Powm, METH_VARARGS, - NULL}, -#ifdef DYING - {"rndm", (PyCFunction)mpw_Rndm, METH_VARARGS, - NULL}, -#endif - {NULL, NULL} /* sentinel */ -}; -/*@=fullinitblock@*/ - -static PyObject * mpw_getattro(PyObject * o, PyObject * n) - /*@*/ -{ - return PyObject_GenericGetAttr(o, n); -} - -static int mpw_setattro(PyObject * o, PyObject * n, PyObject * v) - /*@*/ -{ - return PyObject_GenericSetAttr(o, n, v); -} - -/* ---------- */ - -static PyObject * -mpw_add(PyObject * a, PyObject * b) - /*@*/ -{ - return mpw_ops2("add", '+', mpw_i2mpw(a), mpw_i2mpw(b)); -} - -static PyObject * -mpw_sub(PyObject * a, PyObject * b) - /*@*/ -{ - return mpw_ops2("sub", '-', mpw_i2mpw(a), mpw_i2mpw(b)); -} - -static PyObject * -mpw_mul(PyObject * a, PyObject * b) - /*@*/ -{ - return mpw_ops2("mul", '*', mpw_i2mpw(a), mpw_i2mpw(b)); -} - -static PyObject * -mpw_div(PyObject * a, PyObject * w) - /*@*/ -{ - mpwObject * b = mpw_i2mpw(w); - - if (mpz(MPW_SIZE(b), MPW_DATA(b))) { - Py_DECREF(b); - PyErr_SetString(PyExc_ZeroDivisionError, "mpw_divide by zero"); - return NULL; - } - return mpw_ops2("div", '/', mpw_i2mpw(a), b); -} - -static PyObject * -mpw_classic_div(PyObject * a, PyObject * b) - /*@*/ -{ - if (Py_DivisionWarningFlag && - PyErr_Warn(PyExc_DeprecationWarning, "classic long division") < 0) - return NULL; - return mpw_div(a, b); -} - -static PyObject * -mpw_mod(PyObject * a, PyObject * b) - /*@*/ -{ - return mpw_ops2("rem", '%', mpw_i2mpw(a), mpw_i2mpw(b)); -} - -static PyObject * -mpw_divmod(PyObject * v, PyObject * w) - /*@*/ -{ - PyObject * z = NULL; - mpwObject * q = NULL; - mpwObject * r = NULL; - mpwObject * a = mpw_i2mpw(v); - size_t asize; - mpw* adata; - size_t anorm; - mpwObject * b = mpw_i2mpw(w); - size_t bsize; - mpw* bdata; - size_t bnorm; - size_t zsize; - mpw* zdata; - mpw* wksp; - int qsign = 0; - - if (a == NULL || b == NULL) - goto exit; - - asize = MPW_SIZE(a); - adata = MPW_DATA(a); - anorm = mpsize(asize, adata); - bsize = MPW_SIZE(b); - bdata = MPW_DATA(b); - bnorm = mpsize(bsize, bdata); - - if (mpz(bsize, bdata)) { - PyErr_SetString(PyExc_ZeroDivisionError, "mpw_divmod by zero"); - goto exit; - } - - if (anorm < asize) { - asize -= anorm; - adata += anorm; - } - zsize = asize + 1; - zdata = alloca(zsize * sizeof(*zdata)); - if (bnorm < bsize) { - bsize -= bnorm; - bdata += bnorm; - } - qsign = a->ob_size * b->ob_size; - wksp = alloca((bsize+1) * sizeof(*wksp)); - - mpndivmod(zdata, asize, adata, bsize, bdata, wksp); - -if (_mpw_debug < 0) { -fprintf(stderr, " a %p[%d]:\t", adata, asize), mpfprintln(stderr, asize, adata); -fprintf(stderr, " b %p[%d]:\t", bdata, bsize), mpfprintln(stderr, bsize, bdata); -fprintf(stderr, " z %p[%d]:\t", zdata, zsize), mpfprintln(stderr, zsize, zdata); -} - - zsize -= bsize; - r = mpw_FromMPW(bsize, zdata+zsize, 1); - if (r == NULL) - goto exit; - if (qsign < 0) { - if (b->ob_size < 0) { - (void) mpsubx(MPW_SIZE(r), MPW_DATA(r), bsize, bdata); - mpneg(MPW_SIZE(r), MPW_DATA(r)); - } else { - mpneg(MPW_SIZE(r), MPW_DATA(r)); - (void) mpaddx(MPW_SIZE(r), MPW_DATA(r), bsize, bdata); - } - (void) mpaddw(zsize, zdata, (mpw)1); - } - if (b->ob_size < 0) - r->ob_size = -r->ob_size; - - q = mpw_FromMPW(zsize, zdata, 1); - if (q == NULL) { - Py_DECREF(r); - goto exit; - } - if (qsign < 0) - q->ob_size = -q->ob_size; - -if (_mpw_debug) { -prtmpw("q", q); -prtmpw("r", r); -fprintf(stderr, "*** mpw_divmod(%p,%p)\n", a, b); -} - if ((z = PyTuple_New(2)) == NULL) { - Py_DECREF(q); - Py_DECREF(r); - goto exit; - } - - (void) PyTuple_SetItem(z, 0, (PyObject *)q); - (void) PyTuple_SetItem(z, 1, (PyObject *)r); - -exit: - Py_XDECREF(a); - Py_XDECREF(b); - return (PyObject *)z; -} - -static PyObject * -mpw_pow(PyObject * a, PyObject * b, PyObject * c) - /*@*/ -{ - if (c != Py_None) - return mpw_ops3("Powm", 'P', mpw_i2mpw(a), mpw_i2mpw(b), mpw_i2mpw(c)); - else - return mpw_ops2("pow", 'P', mpw_i2mpw(a), mpw_i2mpw(b)); -} - -static PyObject * -mpw_neg(mpwObject * a) - /*@*/ -{ - mpwObject *z; - - if (a->ob_size == 0 && mpw_CheckExact(a)) { - /* -0 == 0 */ - Py_INCREF(a); - z = a; - } else { - z = mpw_Copy(a); - if (z != NULL) - z->ob_size = -(a->ob_size); - } - -if (z != NULL && _mpw_debug) -fprintf(stderr, "*** mpw_neg %p[%d]\t", MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z)); - - return (PyObject *)z; -} - -static PyObject * -mpw_pos(mpwObject * a) - /*@*/ -{ - mpwObject *z; - - if (mpw_CheckExact(a)) { - Py_INCREF(a); - z = a; - } else - z = mpw_Copy(a); - -if (z != NULL && _mpw_debug) -fprintf(stderr, "*** mpw_pos %p[%d]\t", MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z)); - - return (PyObject *)z; -} - -static PyObject * -mpw_abs(mpwObject * a) - /*@*/ -{ - mpwObject * z; - - if (a->ob_size < 0) - z = (mpwObject *)mpw_neg(a); - else - z = (mpwObject *)mpw_pos(a); - -if (z != NULL && _mpw_debug) -fprintf(stderr, "*** mpw_abs %p[%d]\t", MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z)); - - return (PyObject *)z; -} - -static int -mpw_nonzero(mpwObject * a) - /*@*/ -{ - return ABS(a->ob_size) != 0; -} - -static PyObject * -mpw_invert(mpwObject * a) - /*@*/ -{ - /* Implement ~z as -(z+1) */ - mpwObject * z = mpw_Copy(a); - - if (z != NULL) { - mpw val = 1; - int carry; - - carry = mpaddx(MPW_SIZE(z), MPW_DATA(z), 1, &val); - z->ob_size = -(a->ob_size); - } - return (PyObject *)z; -} - -static PyObject * -mpw_lshift(PyObject * a, PyObject * b) - /*@*/ -{ - return mpw_ops2("lshift", '<', mpw_i2mpw(a), mpw_i2mpw(b)); -} - -static PyObject * -mpw_rshift(PyObject * a, PyObject * b) - /*@*/ -{ - return mpw_ops2("rshift", '>', mpw_i2mpw(a), mpw_i2mpw(b)); -} - -static PyObject * -mpw_and(PyObject * a, PyObject * b) - /*@*/ -{ - return mpw_ops2("and", '&', mpw_i2mpw(a), mpw_i2mpw(b)); -} - -static PyObject * -mpw_xor(PyObject * a, PyObject * b) - /*@*/ -{ - return mpw_ops2("xor", '^', mpw_i2mpw(a), mpw_i2mpw(b)); -} - -static PyObject * -mpw_or(PyObject * a, PyObject * b) - /*@*/ -{ - return mpw_ops2("or", '|', mpw_i2mpw(a), mpw_i2mpw(b)); -} - -static int -mpw_coerce(PyObject ** pv, PyObject ** pw) - /*@modifies *pv, *pw @*/ -{ - -if (_mpw_debug) -fprintf(stderr, "*** mpw_coerce(%p[%s],%p[%s])\n", pv, lbl(*pv), pw, lbl(*pw)); - - if (mpw_Check(*pw)) - Py_INCREF(*pw); - else if (PyInt_Check(*pw)) - *pw = (PyObject *) mpw_FromLong(PyInt_AsLong(*pw)); - else if (PyLong_Check(*pw)) - *pw = (PyObject *) mpw_FromLongObject((PyLongObject *)(*pw)); - else if (PyFloat_Check(*pw)) - *pw = (PyObject *) mpw_FromDouble(PyFloat_AsDouble(*pw)); - else if (PyString_Check(*pw)) - *pw = (PyObject *) mpw_FromHEX(PyString_AS_STRING(*pw)); - else { - PyErr_SetString(PyExc_TypeError, "non-numeric coercion failed (mpw_coerce)"); - return 1; - } - - Py_INCREF(*pv); - return 0; -} - -static PyObject * -mpw_int(mpwObject * a) - /*@*/ -{ - size_t anorm = MPW_SIZE(a) - MP_ROUND_B2W(MPBITCNT(MPW_SIZE(a), MPW_DATA(a))); - size_t asize = MPW_SIZE(a) - anorm; - mpw* adata = MPW_DATA(a) + anorm; - long ival = 0; - - if (asize > 1) { - PyErr_SetString(PyExc_ValueError, "mpw_int: arg too long to convert"); - return NULL; - } - if (asize == 1) - ival = adata[0]; - if (a->ob_size < 0) - ival = -ival; - - return Py_BuildValue("i", ival); -} - -static PyObject * -mpw_long(mpwObject * a) - /*@*/ -{ - size_t abits = MPBITCNT(MPW_SIZE(a), MPW_DATA(a)); - size_t anorm = MPW_SIZE(a) - MP_ROUND_B2W(abits); - size_t asize = MPW_SIZE(a) - anorm; - mpw* adata = MPW_DATA(a) + anorm; - size_t zsize = asize; - mpw* zdata = alloca(zsize * sizeof(*zdata)); - int lsize = BITS_TO_DIGITS(abits); - PyLongObject *lo = _PyLong_New(lsize); - int digx; - - if (lo == NULL) - return NULL; - - mpcopy(asize, zdata, adata); - - for (digx = 0; digx < lsize; digx++) { - lo->ob_digit[digx] = zdata[zsize - 1] & MASK; - mprshift(zsize, zdata, SHIFT); - } - - while (digx > 0 && lo->ob_digit[digx-1] == 0) - digx--; - lo->ob_size = (a->ob_size >= 0 ? digx : -digx); - - return (PyObject *)lo; -} - -static PyObject * -mpw_float(mpwObject * a) - /*@*/ -{ - PyObject * so = mpw_format(a, 10, 0); - char * s, * se; - double d; - - if (so == NULL) - return NULL; - s = PyString_AS_STRING(so); - se = NULL; - d = strtod(s, &se); - -if (_mpw_debug) -fprintf(stderr, "*** mpw_float(%p): s %p \"%s\" se %p d %g\n", a, s, s, se, d); - Py_DECREF(so); - - return Py_BuildValue("d", d); -} - -static PyObject * -mpw_oct(mpwObject * a) - /*@*/ -{ - return mpw_format(a, 8, 1); -} - -static PyObject * -mpw_hex(mpwObject * a) - /*@*/ -{ - return mpw_format(a, 16, 1); -} - -static PyNumberMethods mpw_as_number = { - (binaryfunc) mpw_add, /* nb_add */ - (binaryfunc) mpw_sub, /* nb_subtract */ - (binaryfunc) mpw_mul, /* nb_multiply */ - (binaryfunc) mpw_classic_div, /* nb_divide */ - (binaryfunc) mpw_mod, /* nb_remainder */ - (binaryfunc) mpw_divmod, /* nb_divmod */ - (ternaryfunc) mpw_pow, /* nb_power */ - (unaryfunc) mpw_neg, /* nb_negative */ - (unaryfunc) mpw_pos, /* nb_positive */ - (unaryfunc) mpw_abs, /* nb_absolute */ - (inquiry) mpw_nonzero, /* nb_nonzero */ - (unaryfunc) mpw_invert, /* nb_invert */ - (binaryfunc) mpw_lshift, /* nb_lshift */ - (binaryfunc) mpw_rshift, /* nb_rshift */ - (binaryfunc) mpw_and, /* nb_and */ - (binaryfunc) mpw_xor, /* nb_xor */ - (binaryfunc) mpw_or, /* nb_or */ - (coercion) mpw_coerce, /* nb_coerce */ - - (unaryfunc) mpw_int, /* nb_int */ - (unaryfunc) mpw_long, /* nb_long */ - (unaryfunc) mpw_float, /* nb_float */ - (unaryfunc) mpw_oct, /* nb_oct */ - (unaryfunc) mpw_hex, /* nb_hex */ - - /* Added in release 2.0 */ - (binaryfunc) 0, /* nb_inplace_add */ - (binaryfunc) 0, /* nb_inplace_subtract */ - (binaryfunc) 0, /* nb_inplace_multiply */ - (binaryfunc) 0, /* nb_inplace_divide */ - (binaryfunc) 0, /* nb_inplace_remainder */ - (ternaryfunc)0, /* nb_inplace_power */ - (binaryfunc) 0, /* nb_inplace_lshift */ - (binaryfunc) 0, /* nb_inplace_rshift */ - (binaryfunc) 0, /* nb_inplace_and */ - (binaryfunc) 0, /* nb_inplace_xor */ - (binaryfunc) 0, /* nb_inplace_or */ - - /* Added in release 2.2 */ - /* The following require the Py_TPFLAGS_HAVE_CLASS flag */ - (binaryfunc) mpw_div, /* nb_floor_divide */ - (binaryfunc) 0, /* nb_true_divide */ - (binaryfunc) 0, /* nb_inplace_floor_divide */ - (binaryfunc) 0 /* nb_inplace_true_divide */ - -}; - -/* ---------- */ - -/** - */ -/*@unchecked@*/ /*@observer@*/ -static char mpw_doc[] = -""; - -/*@-fullinitblock@*/ -PyTypeObject mpw_Type = { - PyObject_HEAD_INIT(&PyType_Type) - 0, /* ob_size */ - "rpm.mpw", /* tp_name */ - sizeof(mpwObject) - sizeof(mpw),/* tp_basicsize */ - sizeof(mpw), /* tp_itemsize */ - /* methods */ - (destructor) mpw_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - (cmpfunc) mpw_compare, /* tp_compare */ - (reprfunc) mpw_repr, /* tp_repr */ - &mpw_as_number, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - (hashfunc)0, /* tp_hash */ - 0, /* tp_call */ - (reprfunc) mpw_str, /* tp_str */ - (getattrofunc) mpw_getattro, /* tp_getattro */ - (setattrofunc) mpw_setattro, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES | - Py_TPFLAGS_BASETYPE, /* tp_flags */ - mpw_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - mpw_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, /* tp_alloc */ - (newfunc) mpw_new, /* tp_new */ - (destructor) mpw_free, /* tp_free */ - 0, /* tp_is_gc */ -}; -/*@=fullinitblock@*/ - -/* ---------- */ diff --git a/python/rpmmpw-py.h b/python/rpmmpw-py.h index 2b31043f8..2ad1da47f 100644 --- a/python/rpmmpw-py.h +++ b/python/rpmmpw-py.h @@ -3,7 +3,7 @@ #include "rpmio_internal.h" -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmmpw-py.h */ diff --git a/python/rpmrc-py.c b/python/rpmrc-py.c index a896ca38d..43fb1051f 100644 --- a/python/rpmrc-py.c +++ b/python/rpmrc-py.c @@ -1,4 +1,4 @@ -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmrc-py.c */ @@ -249,7 +249,7 @@ fprintf(stderr, "*** rpmrc_next(%p[%s],%p)\n", s, lbl(s), args); return NULL; } -/** \ingroup py_c +/** \ingroup py_c */ static int rpmrc_init(PyObject * s, PyObject *args, PyObject *kwds) /*@*/ @@ -261,7 +261,7 @@ fprintf(stderr, "*** rpmrc_init(%p[%s],%p,%p)\n", s, lbl(s), args, kwds); return 0; } -/** \ingroup py_c +/** \ingroup py_c */ static void rpmrc_free(PyObject * s) /*@*/ @@ -271,7 +271,7 @@ fprintf(stderr, "*** rpmrc_free(%p[%s])\n", s, lbl(s)); _PyObject_GC_Del(s); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmrc_alloc(PyTypeObject * subtype, int nitems) /*@*/ @@ -283,7 +283,7 @@ fprintf(stderr, "*** rpmrc_alloc(%p[%s},%d) ret %p[%s]\n", subtype, lbl(subtype) return (PyObject *) ns; } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmrc_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds) /*@*/ @@ -322,7 +322,7 @@ static struct PyMethodDef rpmrc_methods[] = { }; /*@=fullinitblock@*/ -/** \ingroup py_c +/** \ingroup py_c */ /*@-fullinitblock@*/ #if Py_TPFLAGS_HAVE_ITER diff --git a/python/rpmrc-py.h b/python/rpmrc-py.h index 788ba3b1b..ccac3b689 100644 --- a/python/rpmrc-py.h +++ b/python/rpmrc-py.h @@ -1,15 +1,15 @@ #ifndef H_RPMRC_PY #define H_RPMRC_PY -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmrc-py.h */ -/** \ingroup py_c +/** \ingroup py_c */ typedef struct rpmrcObject_s rpmrcObject; -/** \ingroup py_c +/** \ingroup py_c */ struct rpmrcObject_s { #if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */ diff --git a/python/rpmrng-py.c b/python/rpmrng-py.c deleted file mode 100644 index 69561ea05..000000000 --- a/python/rpmrng-py.c +++ /dev/null @@ -1,330 +0,0 @@ -/** \ingroup py_c - * \file python/rpmrng-py.c - */ - -#include "system.h" - -#include "Python.h" -#ifdef __LCLINT__ -#undef PyObject_HEAD -#define PyObject_HEAD int _PyObjectHead; -#endif - -#include "rpmrng-py.h" -#include "mpprime.h" - -#include "rpmdebug-py.c" - -#include "debug.h" - -/*@unchecked@*/ -static int _rng_debug = 0; - -/*@unchecked@*/ /*@observer@*/ -static const char initialiser_name[] = "rpm.rng"; - -/* ---------- */ - -static void -rng_dealloc(rngObject * s) - /*@modifies s @*/ -{ -if (_rng_debug < -1) -fprintf(stderr, "*** rng_dealloc(%p)\n", s); - -/*@-modobserver@*/ - randomGeneratorContextFree(&s->rngc); -/*@=modobserver@*/ - mpbfree(&s->b); - PyObject_Del(s); -} - -static int -rng_print(rngObject * s, FILE * fp, /*@unused@*/ int flags) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/ -{ -if (_rng_debug < -1) -fprintf(stderr, "*** rng_print(%p)\n", s); - return 0; -} - -/** \ingroup py_c - */ -static int rng_init(rngObject * s, PyObject *args, PyObject *kwds) - /*@modifies s @*/ -{ - PyObject * o = NULL; - const randomGenerator* rng = NULL; - - if (!PyArg_ParseTuple(args, "|O:Cvt", &o)) return -1; - - if (o) { - /* XXX "FIPS 186" or "Mersenne Twister" */ - if (PyString_Check(o)) - rng = randomGeneratorFind(PyString_AsString(o)); - } - - if (rng == NULL) - rng = randomGeneratorDefault(); - -/*@-modobserver@*/ - if (randomGeneratorContextInit(&s->rngc, rng) != 0) - return -1; -/*@=modobserver@*/ - mpbzero(&s->b); - -if (_rng_debug) -fprintf(stderr, "*** rng_init(%p[%s],%p[%s],%p[%s])\n", s, lbl(s), args, lbl(args), kwds, lbl(kwds)); - - return 0; -} - -/** \ingroup py_c - */ -static void rng_free(/*@only@*/ rngObject * s) - /*@modifies s @*/ -{ -if (_rng_debug) -fprintf(stderr, "*** rng_free(%p[%s])\n", s, lbl(s)); -/*@-modobserver@*/ - randomGeneratorContextFree(&s->rngc); -/*@=modobserver@*/ - mpbfree(&s->b); - PyObject_Del(s); -} - -/** \ingroup py_c - */ -static PyObject * rng_alloc(PyTypeObject * subtype, int nitems) - /*@*/ -{ - PyObject * ns = PyType_GenericAlloc(subtype, nitems); - -if (_rng_debug) -fprintf(stderr, "*** rng_alloc(%p[%s},%d) ret %p[%s]\n", subtype, lbl(subtype), nitems, ns, lbl(ns)); - return (PyObject *) ns; -} - -static PyObject * -rng_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds) - /*@*/ -{ - PyObject * ns = (PyObject *) PyObject_New(rngObject, &rng_Type); - -if (_rng_debug < -1) -fprintf(stderr, "*** rng_new(%p[%s],%p[%s],%p[%s]) ret %p[%s]\n", subtype, lbl(subtype), args, lbl(args), kwds, lbl(kwds), ns, lbl(ns)); - return ns; -} - -static rngObject * -rng_New(void) -{ - rngObject * ns = PyObject_New(rngObject, &rng_Type); - - return ns; -} - -/* ---------- */ - -/** \ingroup py_c - */ -static PyObject * -rng_Debug(/*@unused@*/ rngObject * s, PyObject * args) - /*@globals _Py_NoneStruct @*/ - /*@modifies _Py_NoneStruct @*/ -{ - if (!PyArg_ParseTuple(args, "i:Debug", &_rng_debug)) return NULL; - -if (_rng_debug < 0) -fprintf(stderr, "*** rng_Debug(%p)\n", s); - - Py_INCREF(Py_None); - return Py_None; -} - -/** \ingroup py_c - */ -static PyObject * -rng_Seed(rngObject * s, PyObject * args) - /*@globals _Py_NoneStruct @*/ - /*@modifies _Py_NoneStruct @*/ -{ - PyObject * o; - randomGeneratorContext* rc = &s->rngc; - mpwObject *z; - - if (!PyArg_ParseTuple(args, "O:Seed", &o)) return NULL; - - if (!mpw_Check(o) || MPW_SIZE(z = (mpwObject*)o) > 0) - return NULL; - - rc->rng->seed(rc->param, (byte*) MPW_DATA(z), MPW_SIZE(z)); - -if (_rng_debug < 0) -fprintf(stderr, "*** rng_Seed(%p)\n", s); - - Py_INCREF(Py_None); - return Py_None; -} - -/** \ingroup py_c - */ -static PyObject * -rng_Next(rngObject * s, PyObject * args) - /*@*/ -{ - PyObject * o = NULL; - randomGeneratorContext* rc = &s->rngc; - mpbarrett* b = &s->b; - mpwObject *z; - - if (!PyArg_ParseTuple(args, "|O:Next", &o)) return NULL; - - if (o) { - if (mpw_Check(o) && MPW_SIZE(z = (mpwObject*)o) > 0) { - b = alloca(sizeof(*b)); - mpbzero(b); - /* XXX z probably needs normalization here. */ - mpbset(b, MPW_SIZE(z), MPW_DATA(z)); - } else - ; /* XXX error? */ - } - - if (b == NULL || b->size == 0 || b->modl == NULL) { - z = mpw_New(1); - rc->rng->next(rc->param, (byte*) MPW_DATA(z), sizeof(*MPW_DATA(z))); - } else { - mpw* wksp = alloca(b->size * sizeof(*wksp)); - z = mpw_New(b->size); - mpbrnd_w(b, rc, MPW_DATA(z), wksp); - } - -if (_rng_debug) -fprintf(stderr, "*** rng_Next(%p) %p[%d]\t", s, MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z)); - - return (PyObject *)z; -} - -/** \ingroup py_c - */ -static PyObject * -rng_Prime(rngObject * s, PyObject * args) - /*@*/ -{ - randomGeneratorContext* rc = &s->rngc; - unsigned pbits = 160; - int trials = -1; - size_t psize; - mpbarrett* b; - mpw *temp; - mpwObject *z; - - if (!PyArg_ParseTuple(args, "|ii:Prime", &pbits, &trials)) return NULL; - - psize = MP_ROUND_B2W(pbits); - temp = alloca((8*psize+2) * sizeof(*temp)); - - b = alloca(sizeof(*b)); - mpbzero(b); - - if (trials <= 2) - trials = mpptrials(pbits); -#if 1 - mpprnd_w(b, rc, pbits, trials, (const mpnumber*) 0, temp); -#else - mpprndsafe_w(b, rc, pbits, trials, temp); -#endif - - z = mpw_FromMPW(b->size, b->modl, 1); -if (z != NULL && _rng_debug) -fprintf(stderr, "*** rng_Prime(%p) %p[%d]\t", s, MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z)); - - return (PyObject *)z; -} - -/*@-fullinitblock@*/ -/*@unchecked@*/ /*@observer@*/ -static struct PyMethodDef rng_methods[] = { - {"Debug", (PyCFunction)rng_Debug, METH_VARARGS, - NULL}, - {"seed", (PyCFunction)rng_Seed, METH_VARARGS, - NULL}, - {"next", (PyCFunction)rng_Next, METH_VARARGS, - NULL}, - {"prime", (PyCFunction)rng_Prime, METH_VARARGS, - NULL}, - {NULL, NULL} /* sentinel */ -}; -/*@=fullinitblock@*/ - -static PyObject * rng_getattro(PyObject * o, PyObject * n) - /*@*/ -{ - return PyObject_GenericGetAttr(o, n); -} - -static int rng_setattro(PyObject * o, PyObject * n, PyObject * v) - /*@*/ -{ - return PyObject_GenericSetAttr(o, n, v); -} - -/* ---------- */ - -/** - */ -/*@unchecked@*/ /*@observer@*/ -static char rng_doc[] = -""; - -/*@-fullinitblock@*/ -PyTypeObject rng_Type = { - PyObject_HEAD_INIT(&PyType_Type) - 0, /* ob_size */ - "rpm.rng", /* tp_name */ - sizeof(rngObject), /* tp_basicsize */ - 0, /* tp_itemsize */ - /* methods */ - (destructor) rng_dealloc, /* tp_dealloc */ - (printfunc) rng_print, /* tp_print */ - (getattrfunc)0, /* tp_getattr */ - (setattrfunc)0, /* tp_setattr */ - (cmpfunc)0, /* tp_compare */ - (reprfunc)0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - (hashfunc)0, /* tp_hash */ - (ternaryfunc)0, /* tp_call */ - (reprfunc)0, /* tp_str */ - (getattrofunc) rng_getattro, /* tp_getattro */ - (setattrofunc) rng_setattro, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT, /* tp_flags */ - rng_doc, /* tp_doc */ -#if Py_TPFLAGS_HAVE_ITER - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - (getiterfunc)0, /* tp_iter */ - (iternextfunc)0, /* tp_iternext */ - rng_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc) rng_init, /* tp_init */ - (allocfunc) rng_alloc, /* tp_alloc */ - (newfunc) rng_new, /* tp_new */ - (destructor) rng_free, /* tp_free */ - 0, /* tp_is_gc */ -#endif -}; -/*@=fullinitblock@*/ - -/* ---------- */ diff --git a/python/rpmrng-py.h b/python/rpmrng-py.h index 317d53af3..14c60e6b1 100644 --- a/python/rpmrng-py.h +++ b/python/rpmrng-py.h @@ -3,7 +3,7 @@ #include "rpmio_internal.h" -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmrng-py.h */ diff --git a/python/rpmte-py.c b/python/rpmte-py.c index 1f15102ea..e1e1ff60c 100644 --- a/python/rpmte-py.c +++ b/python/rpmte-py.c @@ -1,4 +1,4 @@ -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmte-py.c */ @@ -289,7 +289,7 @@ rpmte_FI(rpmteObject * s, PyObject * args) return (PyObject *) rpmfi_Wrap(rpmfiLink(fi, "rpmte_FI")); } -/** \ingroup py_c +/** \ingroup py_c */ /*@-fullinitblock@*/ /*@unchecked@*/ /*@observer@*/ @@ -390,7 +390,7 @@ static int rpmte_setattro(PyObject * o, PyObject * n, PyObject * v) static char rpmte_doc[] = ""; -/** \ingroup py_c +/** \ingroup py_c */ /*@-fullinitblock@*/ PyTypeObject rpmte_Type = { diff --git a/python/rpmte-py.h b/python/rpmte-py.h index 54aa7c5c4..504cc5ee2 100644 --- a/python/rpmte-py.h +++ b/python/rpmte-py.h @@ -3,7 +3,7 @@ #include "rpmte.h" -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmte-py.h */ diff --git a/python/rpmts-py.c b/python/rpmts-py.c index eaa80d008..1b81a96cc 100644 --- a/python/rpmts-py.c +++ b/python/rpmts-py.c @@ -1,4 +1,4 @@ -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmts-py.c */ @@ -43,7 +43,7 @@ static int _rpmts_debug = 0; * \name Class: Rpmts * \class Rpmts * \brief A python rpm.ts object represents an RPM transaction set. - * + * * The transaction set is the workhorse of RPM. It performs the * installation and upgrade of packages. The rpm.ts object is * instantiated by the TransactionSet function in the rpm module. @@ -141,14 +141,14 @@ static int _rpmts_debug = 0; * - ts.setProbFilter(ignoreSet) Set transaction set problem filter. * @param problemSetFilter - control bit(s) to ignore classes of problems, * a logical or of one or more of the following bit(s): - * - rpm.RPMPROB_FILTER_IGNOREOS - - * - rpm.RPMPROB_FILTER_IGNOREARCH - - * - rpm.RPMPROB_FILTER_REPLACEPKG - - * - rpm.RPMPROB_FILTER_FORCERELOCATE - - * - rpm.RPMPROB_FILTER_REPLACENEWFILES - - * - rpm.RPMPROB_FILTER_REPLACEOLDFILES - - * - rpm.RPMPROB_FILTER_OLDPACKAGE - - * - rpm.RPMPROB_FILTER_DISKSPACE - + * - rpm.RPMPROB_FILTER_IGNOREOS - + * - rpm.RPMPROB_FILTER_IGNOREARCH - + * - rpm.RPMPROB_FILTER_REPLACEPKG - + * - rpm.RPMPROB_FILTER_FORCERELOCATE - + * - rpm.RPMPROB_FILTER_REPLACENEWFILES - + * - rpm.RPMPROB_FILTER_REPLACEOLDFILES - + * - rpm.RPMPROB_FILTER_OLDPACKAGE - + * - rpm.RPMPROB_FILTER_DISKSPACE - * @return previous ignoreSet * * - ts.run(callback,data) Attempt to execute a transaction set. @@ -157,7 +157,7 @@ static int _rpmts_debug = 0; * the ts.run() method. */ -/** \ingroup py_c +/** \ingroup py_c */ struct rpmtsCallbackType_s { PyObject * cb; @@ -167,7 +167,7 @@ struct rpmtsCallbackType_s { PyThreadState *_save; }; -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_Debug(/*@unused@*/ rpmtsObject * s, PyObject * args) @@ -183,7 +183,7 @@ fprintf(stderr, "*** rpmts_Debug(%p) ts %p\n", s, s->ts); return Py_None; } -/** \ingroup py_c +/** \ingroup py_c * Add package to universe of possible packages to install in transaction set. * @param ts transaction set * @param h header @@ -208,7 +208,7 @@ fprintf(stderr, "\tAddAvailable(%p) list %p\n", ts, ts->availablePackages); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_AddInstall(rpmtsObject * s, PyObject * args) @@ -252,7 +252,7 @@ fprintf(stderr, "*** rpmts_AddInstall(%p,%p,%p,%s) ts %p\n", s, h, key, how, s-> return Py_None; } -/** \ingroup py_c +/** \ingroup py_c * @todo Permit finer control (i.e. not just --allmatches) of deleted elments. */ static PyObject * @@ -263,7 +263,7 @@ rpmts_AddErase(rpmtsObject * s, PyObject * args) PyObject * o; int count; rpmdbMatchIterator mi; - + if (_rpmts_debug) fprintf(stderr, "*** rpmts_AddErase(%p) ts %p\n", s, s->ts); @@ -313,7 +313,7 @@ fprintf(stderr, "*** rpmts_AddErase(%p) ts %p\n", s, s->ts); return Py_None; } -/** \ingroup py_c +/** \ingroup py_c */ static int rpmts_SolveCallback(rpmts ts, rpmds ds, const void * data) @@ -350,7 +350,7 @@ fprintf(stderr, "*** rpmts_SolveCallback(%p,%p,%p) \"%s\"\n", ts, ds, data, rpmd return res; } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_Check(rpmtsObject * s, PyObject * args) @@ -415,7 +415,7 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb); char * needsName, * needsOP, * needsVersion; int needsFlags, sense; fnpyKey key; - + p = ps->probs + i; byName = p->pkgNEVR; @@ -444,7 +444,7 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb); else if (*needsOP == '=') needsFlags |= RPMSENSE_EQUAL; } } - + cf = Py_BuildValue("((sss)(ss)iOi)", byName, byVersion, byRelease, needsName, needsVersion, needsFlags, (key != NULL ? key : Py_None), @@ -463,7 +463,7 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb); return Py_None; } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_Order(rpmtsObject * s, PyObject * args) @@ -484,7 +484,7 @@ fprintf(stderr, "*** rpmts_Order(%p) ts %p\n", s, s->ts); return Py_BuildValue("i", rc); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_Clean(rpmtsObject * s, PyObject * args) @@ -502,7 +502,7 @@ fprintf(stderr, "*** rpmts_Clean(%p) ts %p\n", s, s->ts); return Py_None; } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_IDTXload(rpmtsObject * s, PyObject * args) @@ -546,7 +546,7 @@ fprintf(stderr, "*** rpmts_IDTXload(%p) ts %p\n", s, s->ts); return result; } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_IDTXglob(rpmtsObject * s, PyObject * args) @@ -593,7 +593,7 @@ fprintf(stderr, "*** rpmts_IDTXglob(%p) ts %p\n", s, s->ts); return result; } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_Rollback(rpmtsObject * s, PyObject * args) @@ -629,7 +629,7 @@ fprintf(stderr, "*** rpmts_Rollback(%p) ts %p\n", s, s->ts); return Py_BuildValue("i", rc); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_OpenDB(rpmtsObject * s, PyObject * args) @@ -648,7 +648,7 @@ fprintf(stderr, "*** rpmts_OpenDB(%p) ts %p\n", s, s->ts); return Py_BuildValue("i", rpmtsOpenDB(s->ts, s->ts->dbmode)); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_CloseDB(rpmtsObject * s, PyObject * args) @@ -667,7 +667,7 @@ fprintf(stderr, "*** rpmts_CloseDB(%p) ts %p\n", s, s->ts); return Py_BuildValue("i", rc); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_InitDB(rpmtsObject * s, PyObject * args) @@ -688,7 +688,7 @@ fprintf(stderr, "*** rpmts_InitDB(%p) ts %p\n", s, s->ts); return Py_BuildValue("i", rc); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_RebuildDB(rpmtsObject * s, PyObject * args) @@ -709,7 +709,7 @@ fprintf(stderr, "*** rpmts_RebuildDB(%p) ts %p\n", s, s->ts); return Py_BuildValue("i", rc); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_VerifyDB(rpmtsObject * s, PyObject * args) @@ -730,7 +730,7 @@ fprintf(stderr, "*** rpmts_VerifyDB(%p) ts %p\n", s, s->ts); return Py_BuildValue("i", rc); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_HdrFromFdno(rpmtsObject * s, PyObject * args) @@ -777,7 +777,7 @@ fprintf(stderr, "*** rpmts_HdrFromFdno(%p) ts %p rc %d\n", s, s->ts, rpmrc); return result; } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_HdrCheck(rpmtsObject * s, PyObject * args) @@ -832,7 +832,7 @@ fprintf(stderr, "*** rpmts_HdrCheck(%p) ts %p\n", s, s->ts); return result; } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_SetVSFlags(rpmtsObject * s, PyObject * args) @@ -850,7 +850,7 @@ fprintf(stderr, "*** rpmts_SetVSFlags(%p) ts %p\n", s, s->ts); return Py_BuildValue("i", rpmtsSetVSFlags(s->ts, vsflags)); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_SetColor(rpmtsObject * s, PyObject * args) @@ -868,7 +868,7 @@ fprintf(stderr, "*** rpmts_SetColor(%p) ts %p\n", s, s->ts); return Py_BuildValue("i", rpmtsSetColor(s->ts, tscolor)); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_PgpPrtPkts(rpmtsObject * s, PyObject * args) @@ -900,7 +900,7 @@ fprintf(stderr, "*** rpmts_PgpPrtPkts(%p) ts %p\n", s, s->ts); return Py_BuildValue("i", rc); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_PgpImportPubkey(rpmtsObject * s, PyObject * args) @@ -932,7 +932,7 @@ fprintf(stderr, "*** rpmts_PgpImportPubkey(%p) ts %p\n", s, s->ts); return Py_BuildValue("i", rc); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_GetKeys(rpmtsObject * s, PyObject * args) @@ -969,7 +969,7 @@ fprintf(stderr, "*** rpmts_GetKeys(%p) ts %p\n", s, s->ts); return tuple; } -/** \ingroup py_c +/** \ingroup py_c */ static void * rpmtsCallback(/*@unused@*/ const void * hd, const rpmCallbackType what, @@ -1029,7 +1029,7 @@ rpmtsCallback(/*@unused@*/ const void * hd, const rpmCallbackType what, fd = fdDup(fdno); if (_rpmts_debug) fprintf(stderr, "\t%p = fdDup(%d)\n", fd, fdno); - + return fd; } else if (what == RPMCALLBACK_INST_CLOSE_FILE) { @@ -1047,7 +1047,7 @@ fprintf(stderr, "\t%ld:%ld key %p\n", amount, total, pkgKey); return NULL; } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_SetFlags(rpmtsObject * s, PyObject * args) /*@modifies s @*/ @@ -1063,7 +1063,7 @@ fprintf(stderr, "*** rpmts_SetFlags(%p) ts %p transFlags %x\n", s, s->ts, transF return Py_BuildValue("i", rpmtsSetFlags(s->ts, transFlags)); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_SetProbFilter(rpmtsObject * s, PyObject * args) /*@modifies s @*/ @@ -1083,7 +1083,7 @@ fprintf(stderr, "*** rpmts_SetProbFilter(%p) ts %p ignoreSet %x\n", s, s->ts, ig return Py_BuildValue("i", oignoreSet); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_Run(rpmtsObject * s, PyObject * args) /*@globals rpmGlobalMacroContext, _Py_NoneStruct @*/ @@ -1229,7 +1229,7 @@ rpmts_Match(rpmtsObject * s, PyObject * args) char *key = NULL; int len = 0; int tag = RPMDBI_PACKAGES; - + if (_rpmts_debug) fprintf(stderr, "*** rpmts_Match(%p) ts %p\n", s, s->ts); @@ -1253,7 +1253,7 @@ fprintf(stderr, "*** rpmts_Match(%p) ts %p\n", s, s->ts); return rpmmi_Wrap( rpmtsInitIterator(s->ts, tag, key, len) ); } -/** \ingroup py_c +/** \ingroup py_c */ /*@-fullinitblock@*/ /*@unchecked@*/ /*@observer@*/ @@ -1344,7 +1344,7 @@ static struct PyMethodDef rpmts_methods[] = { }; /*@=fullinitblock@*/ -/** \ingroup py_c +/** \ingroup py_c */ static void rpmts_dealloc(/*@only@*/ rpmtsObject * s) /*@modifies *s @*/ @@ -1367,7 +1367,7 @@ static PyObject * rpmts_getattro(PyObject * o, PyObject * n) return PyObject_GenericGetAttr(o, n); } -/** \ingroup py_c +/** \ingroup py_c */ static int rpmts_setattro(PyObject * o, PyObject * n, PyObject * v) /*@modifies o @*/ @@ -1393,7 +1393,7 @@ static int rpmts_setattro(PyObject * o, PyObject * n, PyObject * v) return 0; } -/** \ingroup py_c +/** \ingroup py_c */ static int rpmts_init(rpmtsObject * s, PyObject *args, PyObject *kwds) /*@globals rpmGlobalMacroContext @*/ @@ -1411,15 +1411,15 @@ fprintf(stderr, "*** rpmts_init(%p,%p,%p)\n", s, args, kwds); s->ts = rpmtsCreate(); (void) rpmtsSetRootDir(s->ts, rootDir); (void) rpmtsSetVSFlags(s->ts, vsflags); - s->keyList = PyList_New(0); - s->scriptFd = NULL; + s->keyList = PyList_New(0); + s->scriptFd = NULL; s->tsi = NULL; s->tsiFilter = 0; return 0; } -/** \ingroup py_c +/** \ingroup py_c */ static void rpmts_free(/*@only@*/ rpmtsObject * s) /*@modifies s @*/ @@ -1438,7 +1438,7 @@ fprintf(stderr, "%p -- ts %p db %p\n", s, s->ts, s->ts->rdb); PyObject_Del((PyObject *)s); } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_alloc(PyTypeObject * subtype, int nitems) /*@*/ @@ -1450,7 +1450,7 @@ fprintf(stderr, "*** rpmts_alloc(%p,%d) ret %p\n", subtype, nitems, s); return s; } -/** \ingroup py_c +/** \ingroup py_c */ static PyObject * rpmts_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds) /*@globals rpmGlobalMacroContext @*/ @@ -1476,7 +1476,7 @@ fprintf(stderr, "%p ++ ts %p db %p\n", s, s->ts, s->ts->rdb); static char rpmts_doc[] = ""; -/** \ingroup py_c +/** \ingroup py_c */ /*@-fullinitblock@*/ PyTypeObject rpmts_Type = { diff --git a/python/rpmts-py.h b/python/rpmts-py.h index a84e03775..049976d67 100644 --- a/python/rpmts-py.h +++ b/python/rpmts-py.h @@ -3,7 +3,7 @@ #include "rpmts.h" -/** \ingroup py_c +/** \ingroup py_c * \file python/rpmts-py.h */ diff --git a/rpmdb/.splintrc b/rpmdb/.splintrc index 6a7ed8ff0..090235f93 100644 --- a/rpmdb/.splintrc +++ b/rpmdb/.splintrc @@ -3,7 +3,6 @@ +partial +forcehints -#-warnunixlib -warnposix +unixlib diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index cd8ff22ac..3e4e3ff46 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -36,9 +36,10 @@ mylibs = librpmdb.la LIBS = -DB3LOBJS = $(shell cat $(top_builddir)/$(WITH_DB_SUBDIR)/db3lobjs) +DB3LO = $(shell cat $(top_builddir)/$(WITH_DB_SUBDIR)/db3lobjs) +DB3LOBJS = $(DB3LO:%.lo=%.o) -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +LDFLAGS = -L$(DESTDIR)$(usrlibdir) usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = librpmdb.la @@ -47,7 +48,7 @@ librpmdb_la_SOURCES = \ hdrNVR.c header.c header_internal.c legacy.c merge.c \ poptDB.c rpmhash.c rpmdb.c \ tagname.c tagtbl.c -librpmdb_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \ +librpmdb_la_LDFLAGS = -release 4.3 \ $(top_builddir)/rpmio/librpmio.la \ $(top_builddir)/popt/libpopt.la \ @WITH_LIBELF_LIB@ \ @@ -87,79 +88,79 @@ db.h: rpmdb_archive_SOURCES = rpmdb_archive_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_archive.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_archive.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \ librpmdb.la rpmdb_checkpoint_SOURCES = rpmdb_checkpoint_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_checkpoint.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_checkpoint.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \ librpmdb.la rpmdb_deadlock_SOURCES = rpmdb_deadlock_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_deadlock.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_deadlock.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \ librpmdb.la rpmdb_dump_SOURCES = rpmdb_dump_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_dump.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_dump.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \ librpmdb.la rpmdb_load_SOURCES = rpmdb_load_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_load.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_load.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \ librpmdb.la rpmdb_printlog_SOURCES = rpmdb_printlog_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_printlog.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_printlog.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \ librpmdb.la rpmdb_recover_SOURCES = rpmdb_recover_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_recover.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_recover.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \ librpmdb.la rpmdb_stat_SOURCES = rpmdb_stat_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_stat.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_stat.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \ librpmdb.la rpmdb_svc_SOURCES = rpmdb_svc_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_proc.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_svc.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_util.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/gen_db_server.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.lo \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_proc.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_svc.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_util.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/gen_db_server.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.o \ librpmdb.la rpmdb_upgrade_SOURCES = rpmdb_upgrade_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_upgrade.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_upgrade.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \ librpmdb.la rpmdb_verify_SOURCES = rpmdb_verify_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_verify.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \ + $(top_builddir)/$(WITH_DB_SUBDIR)/db_verify.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_cache.o \ + $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \ librpmdb.la clean-local: diff --git a/rpmdb/db3.c b/rpmdb/db3.c index d142ef250..2fdfe2e4a 100644 --- a/rpmdb/db3.c +++ b/rpmdb/db3.c @@ -20,6 +20,10 @@ static int _debug = 1; /* XXX if < 0 debugging, > 0 unusual error returns */ #include "debug.h" +#if !defined(DB_CLIENT) /* XXX db-4.2.42 retrofit */ +#define DB_CLIENT DB_RPCCLIENT +#endif + /*@access rpmdb @*/ /*@access dbiIndex @*/ /*@access dbiIndexSet @*/ @@ -453,7 +457,7 @@ static int db3sync(dbiIndex dbi, unsigned int flags) if (db != NULL) rc = db->sync(db, flags); /* XXX DB_INCOMPLETE is returned occaisionally with multiple access. */ -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) _printit = _debug; #else _printit = (rc == DB_INCOMPLETE ? 0 : _debug); @@ -690,13 +694,12 @@ static int db3associate(dbiIndex dbi, dbiIndex dbisecondary, { DB * db = dbi->dbi_db; DB * secondary = dbisecondary->dbi_db; -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) - DB_TXN * txnid = NULL; -#endif int rc; /*@-moduncon@*/ /* FIX: annotate db3 methods */ -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) + DB_TXN * txnid = NULL; + rc = db->associate(db, txnid, secondary, callback, flags); #else rc = db->associate(db, secondary, callback, flags); @@ -892,7 +895,7 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip) DB * db = NULL; DB_ENV * dbenv = NULL; -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) DB_TXN * txnid = NULL; #endif u_int32_t oflags; @@ -1254,7 +1257,7 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip) ? dbfullpath : dbfile; #endif -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) rc = db->open(db, txnid, dbpath, dbsubfile, dbi->dbi_type, oflags, dbi->dbi_perms); #else diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c index 86922368b..d20327c0c 100644 --- a/rpmdb/dbconfig.c +++ b/rpmdb/dbconfig.c @@ -34,8 +34,16 @@ static int dbi_tear_down; /*@unchecked@*/ struct poptOption rdbOptions[] = { /* XXX DB_CXX_NO_EXCEPTIONS */ +#if defined(DB_CLIENT) { "client", 0,POPT_BIT_SET, &db3dbi.dbi_ecflags, DB_CLIENT, NULL, NULL }, +#endif +#if defined(DB_RPCCLIENT) + { "client", 0,POPT_BIT_SET, &db3dbi.dbi_ecflags, DB_RPCCLIENT, + NULL, NULL }, + { "rpcclient", 0,POPT_BIT_SET, &db3dbi.dbi_ecflags, DB_RPCCLIENT, + NULL, NULL }, +#endif { "xa_create", 0,POPT_BIT_SET, &db3dbi.dbi_cflags, DB_XA_CREATE, NULL, NULL }, diff --git a/rpmio/.splintrc b/rpmio/.splintrc index 256d7c06b..e5af61899 100644 --- a/rpmio/.splintrc +++ b/rpmio/.splintrc @@ -3,7 +3,6 @@ +partial +forcehints -#-warnunixlib -warnposix +unixlib diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 4ac62cdef..b1ddd5bec 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -31,7 +31,7 @@ librpmio_la_SOURCES = \ argv.c digest.c fts.c macro.c \ rpmio.c rpmlog.c rpmmalloc.c \ rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c stubs.c url.c ugid.c -librpmio_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \ +librpmio_la_LDFLAGS = -release 4.3 $(LDFLAGS) \ @WITH_BEECRYPT_LIB@ \ $(top_builddir)/file/src/libfmagic.la \ @WITH_ZLIB_LIB@ \ diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index f6530619b..faf858d22 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -98,7 +98,8 @@ struct pgpDig_s { typedef struct _FDSTACK_s { /*@exposed@*/ FDIO_t io; -/*@dependent@*/ void * fp; +/*@dependent@*/ + void * fp; int fdno; } FDSTACK_t; diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c index ecff7ee6e..8d05caa4d 100644 --- a/rpmio/rpmsq.c +++ b/rpmio/rpmsq.c @@ -7,6 +7,7 @@ #if defined(__LCLINT__) #define _BITS_SIGTHREAD_H /* XXX avoid __sigset_t heartburn. */ +/*@-incondefs -protoparammatch@*/ /*@-exportheader@*/ /*@constant int SA_SIGINFO@*/ extern int sighold(int sig) @@ -61,34 +62,42 @@ extern void _pthread_cleanup_push(/*@out@*/ struct _pthread_cleanup_buffer *__bu /*@modifies internalState @*/; extern int pthread_mutexattr_destroy(pthread_mutexattr_t *attr) - /*@modifies *attr @*/; + /*@globals errno, internalState @*/ + /*@modifies *attr, errno, internalState @*/; extern int pthread_mutexattr_init(/*@out@*/ pthread_mutexattr_t *attr) - /*@modifies *attr @*/; + /*@globals errno, internalState @*/ + /*@modifies *attr, errno, internalState @*/; int pthread_mutexattr_gettype(const pthread_mutexattr_t *restrict attr, /*@out@*/ int *restrict type) /*@modifies *type @*/; int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type) - /*@modifies *attr @*/; + /*@globals errno, internalState @*/ + /*@modifies *attr, errno, internalState @*/; extern int pthread_mutex_destroy(pthread_mutex_t *mutex) /*@modifies *mutex @*/; extern int pthread_mutex_init(/*@out@*/ pthread_mutex_t *restrict mutex, /*@null@*/ const pthread_mutexattr_t *restrict attr) - /*@modifies *mutex @*/; + /*@globals errno, internalState @*/ + /*@modifies *mutex, errno, internalState @*/; extern int pthread_mutex_lock(pthread_mutex_t *mutex) - /*@modifies *mutex @*/; + /*@globals errno @*/ + /*@modifies *mutex, errno @*/; extern int pthread_mutex_trylock(pthread_mutex_t *mutex) - /*@modifies *mutex @*/; + /*@globals errno @*/ + /*@modifies *mutex, errno @*/; extern int pthread_mutex_unlock(pthread_mutex_t *mutex) - /*@modifies *mutex @*/; + /*@globals errno @*/ + /*@modifies *mutex, errno @*/; extern int pthread_cond_destroy(pthread_cond_t *cond) /*@modifies *cond @*/; extern int pthread_cond_init(/*@out@*/ pthread_cond_t *restrict cond, const pthread_condattr_t *restrict attr) - /*@modifies *cond @*/; + /*@globals errno, internalState @*/ + /*@modifies *cond, errno, internalState @*/; extern int pthread_cond_timedwait(pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex, @@ -98,11 +107,14 @@ extern int pthread_cond_wait(pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex) /*@modifies *cond, *mutex @*/; extern int pthread_cond_broadcast(pthread_cond_t *cond) - /*@modifies *cond @*/; + /*@globals errno, internalState @*/ + /*@modifies *cond, errno, internalState @*/; extern int pthread_cond_signal(pthread_cond_t *cond) - /*@modifies *cond @*/; + /*@globals errno, internalState @*/ + /*@modifies *cond, errno, internalState @*/; /*@=exportheader@*/ +/*@=incondefs =protoparammatch@*/ #endif #include <signal.h> @@ -19,6 +19,14 @@ typedef unsigned char u_int8_t; /*@-incondefs@*/ /* LCLint 3.0.0.15 */ typedef int int32_t; /*@=incondefs@*/ +/* XXX from /usr/include/bits/sigset.h */ +/*@-sizeoftype@*/ +# define _SIGSET_NWORDS (1024 / (8 * sizeof (unsigned long int))) +typedef struct + { + unsigned long int __val[_SIGSET_NWORDS]; + } __sigset_t; +/*@=sizeoftype@*/ /*@=redef@*/ #endif |