From d0615e9641047afab2706be1ce7537e35c3c6242 Mon Sep 17 00:00:00 2001 From: jbj Date: Sun, 13 Feb 2005 03:01:09 +0000 Subject: [PATCH] - macosx: change to --prefix=/usr rather than /opt/local. - use waitpid rather than SIGCHLD reaper. - rip out DB_PRIVATE revert if not NPTL, it's not the right thing to do. CVS patchset: 7761 CVS date: 2005/02/13 03:01:09 --- CHANGES | 3 +++ autogen.sh | 5 +++-- configure.ac | 4 ++-- lib/rpmts.c | 4 ++-- lua/Makefile.am | 2 +- po/cs.po | 28 ++++++++++++++-------------- po/da.po | 28 ++++++++++++++-------------- po/de.po | 29 +++++++++++++++-------------- po/fi.po | 28 ++++++++++++++-------------- po/fr.po | 26 +++++++++++++------------- po/gl.po | 24 ++++++++++++------------ po/is.po | 28 ++++++++++++++-------------- po/ja.po | 28 ++++++++++++++-------------- po/ko.po | 28 ++++++++++++++-------------- po/no.po | 28 ++++++++++++++-------------- po/pl.po | 27 ++++++++++++++------------- po/pt.po | 28 ++++++++++++++-------------- po/pt_BR.po | 29 +++++++++++++++-------------- po/ro.po | 24 ++++++++++++------------ po/rpm.pot | 24 ++++++++++++------------ po/ru.po | 28 ++++++++++++++-------------- po/sk.po | 28 ++++++++++++++-------------- po/sl.po | 30 +++++++++++++++--------------- po/sr.po | 28 ++++++++++++++-------------- po/sv.po | 27 ++++++++++++++------------- po/tr.po | 28 ++++++++++++++-------------- rpmdb/db3.c | 4 ++++ rpmio/rpmsq.c | 2 +- 28 files changed, 306 insertions(+), 294 deletions(-) diff --git a/CHANGES b/CHANGES index fcd2b4b..733a7c8 100644 --- a/CHANGES +++ b/CHANGES @@ -24,6 +24,9 @@ - permit build scriptlet interpreters to be individually overridden. - zlib: uniqify certain symbols to prevent name space pollution. - macosx: include so that python sees the u_char typedef. + - macosx: change to --prefix=/usr rather than /opt/local. + - use waitpid rather than SIGCHLD reaper. + - rip out DB_PRIVATE revert if not NPTL, it's not the right thing to do. 4.3.3 -> 4.4: - pentium3/pentium4 arch support (pluto@PLD). diff --git a/autogen.sh b/autogen.sh index 518c9f6..4a44ea9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -30,8 +30,9 @@ esac [ "`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 +myopts= if [ X"$@" = X -a "X`uname -s`" = "XDarwin" -a -d /opt/local ]; then - export myprefix=/opt/local + export myopts="--prefix=/usr --disable-nls" export CPPFLAGS="-I${myprefix}/include" fi @@ -80,5 +81,5 @@ if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=${infodir} --mandir=${mandir} ${enable_posixmutexes} "$@" else - ./configure --prefix=${myprefix} "$@" + ./configure ${myopts} "$@" fi diff --git a/configure.ac b/configure.ac index 5fa7b47..864a2ae 100644 --- a/configure.ac +++ b/configure.ac @@ -327,7 +327,7 @@ localdone= dirs=$prefix if test "$cross_compiling" != "yes"; then - dirs="$dirs /usr/local" + dirs="$dirs /opt/local /usr/local" fi for dir in $dirs do @@ -378,7 +378,7 @@ dnl dnl Checks for libraries. #================= -# Check for beecrypt library. Prefer external, otherwise internal. +# Check for libelf library. Prefer external, otherwise internal. WITH_ELFUTILS_SUBDIR= WITH_LIBELF_INCLUDE= WITH_LIBELF_LIB= diff --git a/lib/rpmts.c b/lib/rpmts.c index 2886420..26eb563 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -1220,7 +1220,7 @@ int rpmtsInitDSI(const rpmts ts) rpmMessage(RPMMESS_DEBUG, _("mounted filesystems:\n")); rpmMessage(RPMMESS_DEBUG, - _(" i dev bsize bavail iavail mount point\n")); + _(" i dev bsize bavail iavail mount point\n")); rc = rpmGetFilesystemList(&ts->filesystems, &ts->filesystemCount); if (rc || ts->filesystems == NULL || ts->filesystemCount <= 0) @@ -1276,7 +1276,7 @@ int rpmtsInitDSI(const rpmts ts) /* XXX Avoid FAT and other file systems that have not inodes. */ dsi->iavail = !(sfb.f_ffree == 0 && sfb.f_files == 0) ? sfb.f_ffree : -1; - rpmMessage(RPMMESS_DEBUG, _("%5d 0x%04x %5u %12ld %12ld %s\n"), + rpmMessage(RPMMESS_DEBUG, _("%5d 0x%08x %8u %12ld %12ld %s\n"), i, (unsigned) dsi->dev, (unsigned) dsi->bsize, (signed long) dsi->bavail, (signed long) dsi->iavail, ts->filesystems[i]); diff --git a/lua/Makefile.am b/lua/Makefile.am index 293e000..6c9649e 100644 --- a/lua/Makefile.am +++ b/lua/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/local -I$(includedir) lua_lua_SOURCES = lua/lua.c lua_lua_CFLAGS = -DLUA_USERCONFIG='"$(srcdir)/local/userconfig.c"' -lua_lua_LDADD = $(LDADD) -lreadline -lhistory -lncurses +lua_lua_LDADD = $(LDADD) -L/usr/lib -L/opt/local/lib -lreadline -lhistory -lncurses luac_luac_SOURCES = luac/luac.c luac/print.c lopcodes.c luac_luac_CFLAGS = -DLUA_OPNAMES diff --git a/po/cs.po b/po/cs.po index c6212f0..19ed40a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -3160,13 +3160,13 @@ msgid "mounted filesystems:\n" msgstr "získávám seznam pøipojených systémù souborù\n" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "Soubor %4d: %07o %s.%s\t %s\n" #: lib/rpmts.c:1616 #, c-format @@ -3626,46 +3626,46 @@ msgstr "" msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 #, fuzzy msgid "shared" msgstr "sdílen v síti " -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "" diff --git a/po/da.po b/po/da.po index 6258bd2..3cb76f4 100644 --- a/po/da.po +++ b/po/da.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -3177,13 +3177,13 @@ msgid "mounted filesystems:\n" msgstr "henter liste over monterede filsystemer\n" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "Fil %4d: %07o %s.%s\t %s\n" #: lib/rpmts.c:1616 #, c-format @@ -3640,45 +3640,45 @@ msgstr "lukkede db-milj msgid "removed db environment %s/%s\n" msgstr "fjernede db-miljø %s/%s\n" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "åbner db-miljø %s/%s %s\n" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "lukkede db-indeks %s/%s\n" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "lukkede db-indeks %s/%s\n" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "åbner db-indeks %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kan ikke opnå %s lås på %s/%s\n" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "eksklusiv" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "delt" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" diff --git a/po/de.po b/po/de.po index 2d2aec7..59281f8 100644 --- a/po/de.po +++ b/po/de.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -3343,13 +3343,14 @@ msgid "mounted filesystems:\n" msgstr "" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" +# , c-format #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "Öffnen von %s fehlgeschlagen: %s" #: lib/rpmts.c:1616 #, c-format @@ -3808,45 +3809,45 @@ msgstr "" msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kann %s lock für die Datenbank nicht bekommen" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "exklusiv" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "geteilt" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" diff --git a/po/fi.po b/po/fi.po index d7f4634..07fd472 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" @@ -3205,13 +3205,13 @@ msgid "mounted filesystems:\n" msgstr "" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "en voinut avata %s: %s" #: lib/rpmts.c:1616 #, c-format @@ -3670,45 +3670,45 @@ msgstr "" msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "en voi saada %s lukitusta tietokantaan" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "poissulkevaa" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "jaettua" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" diff --git a/po/fr.po b/po/fr.po index 16c7630..50342ca 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM 4.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2003-07-06 01:36+0200\n" "Last-Translator: RPM French Translation \n" "Language-Team: RPM French Translation \n" @@ -3187,12 +3187,12 @@ msgid "mounted filesystems:\n" msgstr "systèmes de fichiers montés:\n" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" msgstr "%5d 0x%04x %5u %12ld %12ld %s\n" #: lib/rpmts.c:1616 @@ -3648,47 +3648,47 @@ msgstr "fermeture db environnement %s/%s\n" msgid "removed db environment %s/%s\n" msgstr "enlèvement db environnement %s/%s\n" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "ouverture db environnement %s/%s %s\n" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "fermeture index db %s/%s\n" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "vérif. db index %s/%s\n" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, 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" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "ouverture index db %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "impossible d'avoir le verrou %s sur %s/%s\n" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "exclusif" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "partagé" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "verrouillage index db %s/%s\n" diff --git a/po/gl.po b/po/gl.po index 6108ad6..8037aa6 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -3056,12 +3056,12 @@ msgid "mounted filesystems:\n" msgstr "" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 #, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" msgstr "" #: lib/rpmts.c:1616 @@ -3510,45 +3510,45 @@ msgstr "" msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "" diff --git a/po/is.po b/po/is.po index 8acd726..5f9c6e8 100644 --- a/po/is.po +++ b/po/is.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -3089,13 +3089,13 @@ msgid "mounted filesystems:\n" msgstr "" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "Skrá %s: %s\n" #: lib/rpmts.c:1616 #, c-format @@ -3544,45 +3544,45 @@ msgstr "loka msgid "removed db environment %s/%s\n" msgstr "fjarlægði gagnagrunnsumhverfi %s/%s\n" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "opna gagnagrunnsumhverfi %s/%s %s\n" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "einka" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "deildann" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 461651d..f588e4f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -3251,13 +3251,13 @@ msgid "mounted filesystems:\n" msgstr "¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "¥Õ¥¡¥¤¥ë %4d: %07o %s.%s\t %s\n" #: lib/rpmts.c:1616 #, c-format @@ -3719,45 +3719,45 @@ msgstr "%s msgid "removed db environment %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "½ü³°" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "¶¦Í­" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" diff --git a/po/ko.po b/po/ko.po index 206264e..561ef26 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -3154,13 +3154,13 @@ msgid "mounted filesystems:\n" msgstr "" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "ÆÄÀÏ%5d: %07o %s.%s\t %s\n" #: lib/rpmts.c:1616 #, c-format @@ -3615,45 +3615,45 @@ msgstr " msgid "removed db environment %s/%s\n" msgstr "»èÁ¦µÈ db ȯ°æ %s/%s\n" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "¿©´ÂÁß db ȯ°æ %s/%s %s\n" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "´ÝÈù db À妽º %s/%s\n" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "°ËÁõµÈ db À妽º %s/%s\n" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "¿©´ÂÁß db À妽º %s/%s %s ¸ðµå=0x%x\n" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "%2$s/%3$sÀÇ Àá±ÝµÈ(lock) %1$s(À»)¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "Æó¼âÀû(exclusive)" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "°øÀ¯µÊ" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "Àá±ÝµÈ db À妽º %s/%s\n" diff --git a/po/no.po b/po/no.po index f19225a..5da7b4c 100644 --- a/po/no.po +++ b/po/no.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -3127,13 +3127,13 @@ msgid "mounted filesystems:\n" msgstr "henter liste over monterte filsystemer\n" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "Fil %s: %s\n" #: lib/rpmts.c:1616 #, c-format @@ -3587,45 +3587,45 @@ msgstr "" msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 68a1d53..a30bd2f 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.3-20030515\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2003-06-08 22:42+0200\n" "Last-Translator: Arkadiusz Miskiewicz \n" "Language-Team: Polish \n" @@ -3117,12 +3117,13 @@ msgid "mounted filesystems:\n" msgstr "podmontowane systemy plików:\n" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +#, fuzzy +msgid " i dev bsize bavail iavail mount point\n" msgstr " i urz bloków bl.wolnych i.wolnych punkt montowania\n" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" msgstr "%5d 0x%04x %5u %12ld %12ld %s\n" #: lib/rpmts.c:1616 @@ -3572,47 +3573,47 @@ msgstr "zamkni msgid "removed db environment %s/%s\n" msgstr "usuniêto ¶rodowisko db %s/%s\n" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "otwieranie ¶rodowiska db %s/%s %s\n" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "zamkniêto indeks db %s/%s\n" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "sprawdzono indeks db %s/%s\n" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, 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" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otwieranie indeksu db %s/%s %s w trybie 0x%x\n" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nie mo¿na uzyskaæ %s blokady na %s/%s\n" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "wy³±cznej" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "dzielonej" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "zablokowano indeks db %s/%s\n" diff --git a/po/pt.po b/po/pt.po index ed35722..122ce9f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires \n" "Language-Team: pt \n" "Language-Team: Brazilian Portuguese\n" @@ -3408,13 +3408,14 @@ msgid "mounted filesystems:\n" msgstr "" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" +# , c-format #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "No consegui ler o arquivo spec de %s\n" #: lib/rpmts.c:1616 #, c-format @@ -3883,45 +3884,45 @@ msgstr "" msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "no foi passado pacote para desinstalao" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" diff --git a/po/ro.po b/po/ro.po index d0b52f7..4e97254 100644 --- a/po/ro.po +++ b/po/ro.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -3056,12 +3056,12 @@ msgid "mounted filesystems:\n" msgstr "" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 #, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" msgstr "" #: lib/rpmts.c:1616 @@ -3510,45 +3510,45 @@ msgstr "" msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index d2e8fb4..1a468ce 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3062,12 +3062,12 @@ msgid "mounted filesystems:\n" msgstr "" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 #, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" msgstr "" #: lib/rpmts.c:1616 @@ -3516,45 +3516,45 @@ msgstr "" msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 1dcf558..542a660 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" @@ -3133,13 +3133,13 @@ msgid "mounted filesystems:\n" msgstr "ÓÔÒÏÉÔÓÑ ÓÐÉÓÏË ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "æÁÊÌ%5d: %07o %s.%s\t %s\n" #: lib/rpmts.c:1616 #, c-format @@ -3590,45 +3590,45 @@ msgstr " msgid "removed db environment %s/%s\n" msgstr "ÕÄÁÌÅÎÏ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s\n" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "ÚÁËÒÙÔ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "ÐÒÏ×ÅÒÅÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÎÁ %s/%s\n" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "ÒÁÚÄÅÌÑÅÍÙÊ" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" diff --git a/po/sk.po b/po/sk.po index 4b43c3c..0999fcb 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -3206,13 +3206,13 @@ msgid "mounted filesystems:\n" msgstr "" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "Súbor %4d: 0%o %s.%s\t %s\n" #: lib/rpmts.c:1616 #, c-format @@ -3674,45 +3674,45 @@ msgstr "odstra msgid "removed db environment %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otvára sa databáza s právami 0x%x v %s\n" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nie je mo¾né získa» %s zámok pre databázu" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "výhradný" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "zdieµaný" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" diff --git a/po/sl.po b/po/sl.po index 7430a51..e6118d1 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,13 +1,13 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.389.2.15 2005/02/12 14:12:36 jbj Exp $ +# $Id: sl.po,v 1.389.2.16 2005/02/13 03:01:14 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -3211,13 +3211,13 @@ msgid "mounted filesystems:\n" msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "Datoteka: %4d: %07o %s.%s\t %s\n" #: lib/rpmts.c:1616 #, c-format @@ -3679,45 +3679,45 @@ msgstr "zaprto db okolje %s/%s\n" msgid "removed db environment %s/%s\n" msgstr "odstranjeno db okolje %s/%s\n" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "odpiranje db okolja %s/%s %s\n" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "zaprto db kazalo %s/%s\n" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "zaprto db kazalo %s/%s\n" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "odpiranje db kazala %s/%s %s naèin=0x%x\n" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ni mo¾no zakleniti z %s datotek %s/%s\n" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "izkljuèujoèe" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "skupno" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "zaklenjeno db kazalo %s/%s\n" diff --git a/po/sr.po b/po/sr.po index 1eae9df..b1445bc 100644 --- a/po/sr.po +++ b/po/sr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2004-02-29 07:48+0500\n" "Last-Translator: unknown\n" "Language-Team: unknown\n" @@ -3199,13 +3199,13 @@ msgid "mounted filesystems:\n" msgstr "" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "neuspelo otvaranje %s: %s" #: lib/rpmts.c:1616 #, c-format @@ -3664,45 +3664,45 @@ msgstr "" msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "ekskluzivno" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "deljeno" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" diff --git a/po/sv.po b/po/sv.po index b7955e6..0fc047b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2003-02-05 12:40+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -3117,12 +3117,13 @@ msgid "mounted filesystems:\n" msgstr "monterade filsystem:\n" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +#, fuzzy +msgid " i dev bsize bavail iavail mount point\n" msgstr " i enhet bstrl btillg itillg monteringspunkt\n" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" msgstr "%5d 0x%04x %5u %12ld %12ld %s\n" #: lib/rpmts.c:1616 @@ -3576,46 +3577,46 @@ msgstr "st msgid "removed db environment %s/%s\n" msgstr "tog bort db-miljö %s/%s\n" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "öppnar db-miljö %s/%s %s\n" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "stängde db-index %s/%s\n" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "verifierade db-index %s/%s\n" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" "odelad posix-mutex funna(%d), lägger till DB_PRIVATE, använder fcntl-lås\n" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "öppnar db-index %s/%s %s rättighet=0x%x\n" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kan inte få %s lås på %s/%s\n" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "uteslutande" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "delat" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" diff --git a/po/tr.po b/po/tr.po index 567a314..835dbd7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 13:27-0500\n" +"POT-Creation-Date: 2005-02-12 17:25-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -3176,13 +3176,13 @@ msgid "mounted filesystems:\n" msgstr "baðlý dosya sistemlerinin listesi alýnýyor\n" #: lib/rpmts.c:1223 -msgid " i dev bsize bavail iavail mount point\n" +msgid " i dev bsize bavail iavail mount point\n" msgstr "" #: lib/rpmts.c:1279 -#, c-format -msgid "%5d 0x%04x %5u %12ld %12ld %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%5d 0x%08x %8u %12ld %12ld %s\n" +msgstr "Dosya %4d: %07o %s.%s\t %s\n" #: lib/rpmts.c:1616 #, c-format @@ -3637,45 +3637,45 @@ msgstr "kapand msgid "removed db environment %s/%s\n" msgstr "silindi db ortamý %s/%s\n" -#: rpmdb/db3.c:296 +#: rpmdb/db3.c:298 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "açýlýyor db ortamý %s/%s %s\n" -#: rpmdb/db3.c:792 +#: rpmdb/db3.c:794 #, c-format msgid "closed db index %s/%s\n" msgstr "kapandý db endeks %s/%s\n" -#: rpmdb/db3.c:861 +#: rpmdb/db3.c:863 #, c-format msgid "verified db index %s/%s\n" msgstr "doðrulandý db endeks %s/%s\n" -#: rpmdb/db3.c:999 +#: rpmdb/db3.c:1002 #, c-format msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n" msgstr "" -#: rpmdb/db3.c:1103 +#: rpmdb/db3.c:1107 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "açýlýyor db endeks %s/%s %s kip=0x%x\n" -#: rpmdb/db3.c:1341 +#: rpmdb/db3.c:1345 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "%s kilit %s/%s'den alýnamadý\n" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "exclusive" msgstr "baðdaþýk" -#: rpmdb/db3.c:1343 +#: rpmdb/db3.c:1347 msgid "shared" msgstr "paylaþýmlý" -#: rpmdb/db3.c:1347 +#: rpmdb/db3.c:1351 #, c-format msgid "locked db index %s/%s\n" msgstr "kilitli db endeks %s/%s\n" diff --git a/rpmdb/db3.c b/rpmdb/db3.c index ff2bd31..e0018a2 100644 --- a/rpmdb/db3.c +++ b/rpmdb/db3.c @@ -217,6 +217,7 @@ static int db3_fsync_disable(/*@unused@*/ int fd) return 0; } +#if 0 #if HAVE_LIBPTHREAD #if HAVE_PTHREAD_H #include @@ -265,6 +266,7 @@ static int db3_pthread_nptl(void) return ret; } #endif +#endif /*@-moduncon@*/ /* FIX: annotate db3 methods */ static int db_init(dbiIndex dbi, const char * dbhome, @@ -990,6 +992,7 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip) */ if (dbi->dbi_use_dbenv) { +#if 0 #if HAVE_LIBPTHREAD if (rpmdb->db_dbenv == NULL) { /* Set DB_PRIVATE if posix mutexes are not shared. */ @@ -1000,6 +1003,7 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip) } } #endif +#endif if (access(dbhome, W_OK) == -1) { diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c index 1b59c36..c49e9cd 100644 --- a/rpmio/rpmsq.c +++ b/rpmio/rpmsq.c @@ -206,7 +206,7 @@ fprintf(stderr, " Insert(%p): %p\n", ME(), sq); sq->child = 0; sq->reaped = 0; sq->status = 0; - sq->reaper = 1; + sq->reaper = 0; /*@-bounds@*/ sq->pipes[0] = sq->pipes[1] = -1; /*@=bounds@*/ -- 2.7.4