From ce1e8d26ec5c76550c59fa30b6e6787e21f866e0 Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 31 Oct 2000 16:18:34 +0000 Subject: [PATCH] - add support for SHA1 as well as MD5 message digests. lclint annotations. CVS patchset: 4234 CVS date: 2000/10/31 16:18:34 --- CHANGES | 1 + po/cs.po | 145 +++++++------- po/da.po | 144 +++++++------- po/de.po | 145 +++++++------- po/es.po | 144 +++++++------- po/fi.po | 145 +++++++------- po/fr.po | 145 +++++++------- po/gl.po | 144 +++++++------- po/hu.po | 144 +++++++------- po/id.po | 144 +++++++------- po/is.po | 144 +++++++------- po/it.po | 144 +++++++------- po/ja.po | 147 +++++++------- po/ko.po | 144 +++++++------- po/no.po | 144 +++++++------- po/pl.po | 145 +++++++------- po/pt.po | 144 +++++++------- po/pt_BR.po | 145 +++++++------- po/ro.po | 144 +++++++------- po/rpm.pot | 88 ++++----- po/ru.po | 145 +++++++------- po/sk.po | 145 +++++++------- po/sl.po | 147 +++++++------- po/sr.po | 145 +++++++------- po/sv.po | 145 +++++++------- po/tr.po | 145 +++++++------- po/uk.po | 144 +++++++------- po/wa.po | 144 +++++++------- po/zh.po | 144 +++++++------- po/zh_CN.GB2312.po | 144 +++++++------- rpmio/.cvsignore | 3 +- rpmio/Makefile.am | 5 +- rpmio/base64.c | 30 +-- rpmio/digest.c | 525 +++++++++++++++++++++++++++++++++++++++++++++++++ rpmio/macro.c | 47 +++-- rpmio/md5.c | 334 ------------------------------- rpmio/rpmio.c | 56 ++++-- rpmio/rpmio.h | 6 +- rpmio/rpmio_internal.h | 88 ++++++--- rpmio/rpmlog.c | 15 +- rpmio/rpmmalloc.c | 14 +- rpmio/rpmrpc.c | 111 ++++++----- rpmio/rpmurl.h | 3 +- rpmio/tdigest.c | 61 ++++++ rpmio/url.c | 14 +- system.h | 4 +- 46 files changed, 3018 insertions(+), 2436 deletions(-) create mode 100644 rpmio/digest.c delete mode 100644 rpmio/md5.c create mode 100644 rpmio/tdigest.c diff --git a/CHANGES b/CHANGES index 6b37ed8..02cd023 100644 --- a/CHANGES +++ b/CHANGES @@ -22,6 +22,7 @@ - hide libio lossage in prototype, not API. - add brp-strip-shared script . - better item/task progress bars . + - add support for SHA1 as well as MD5 message digests. 3.0.6 -> 4.0 - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. diff --git a/po/cs.po b/po/cs.po index b8f4aa2..bc0741b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 2000-08-08 22:37+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "chyba: nemohu otevøít %s/packages.rpm\n" @@ -3080,7 +3080,7 @@ msgstr "otev 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:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "nezdá se, ¾e by %s byl balíèek typu RPM\n" @@ -3144,7 +3144,7 @@ msgstr "z msgid "record %d could not be read\n" msgstr "záznam %d nelze pøeèíst\n" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" @@ -3447,104 +3447,113 @@ msgstr "ma msgid "failed to remove directory %s: %s\n" msgstr "nemohu odstranit adresáø %s: %s\n" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "nezadány ¾ádné balíèky pro instalaci" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "poèítám balíèky pro instalaci\n" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "nalezeno %d balíèkù\n" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "hledám balíèky pro sta¾ení\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "pøeskakuji %s - rpmGlob selhal(%d)\n" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "Stahuji %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr " ... jako %s\n" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "pøeskakuji %s - pøenos selhal - %s\n" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "pøijato %d balíèkù\n" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "nemohu otevøít soubor %s: %s\n" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "%s nemù¾e být nainstalován\n" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít databázi balíèkù v %s\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "balíèek %s není pøemístitelný\n" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "chyba pøi ètení ze souboru %s\n" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "soubor %s vy¾aduje novìj¹í verzi RPM\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "nalezeno %d zdrojových a %d binárních balíèkù\n" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "nevyøe¹ené závislosti:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "instaluji binární balíèky\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" urèuje více balíèkù\n" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "Instaluji %s\n" @@ -3865,141 +3874,141 @@ msgstr "chyb msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "Úspìch" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "Chybná odezva FTP serveru" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "IO chyba serveru" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "Timeout serveru" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "Nelze pøevést jméno na IP adresu poèítaèe" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "Nelze pøevést IP na jméno poèítaèe" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "Pøipojení k serveru selhalo" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "Selhalo navázání datového spojení se serverem" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "IO chyba pøi lokálním souboru" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "Chyba pøi nastavení vzdáleného serveru do pasivního re¾imu" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "Soubor nebyl na serveru nalezen" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "Probíhá pøeru¹ení" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "Neznámá nebo neoèekávaná chyba" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "pøihla¹ování na %s jako %s, heslo %s\n" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktivní %d prázdný %d\n" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(prázdný)" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(prázdný)\n" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "Makro %%%s má neukonèené tìlo" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "Makro %%%s má neplatné jméno (%%define)" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "Makro %%%s má neukonèené parametry" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "Makro %%%s má prázdné tìlo" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "Expanze makra %%%s selhala" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "Makro %%%s má neplatné jméno (%%undefine)" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "Makro %%%s (%s) nebylo pou¾ito pod úrovní %d" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "Neznámá volba: %c v %s(%s)" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "Hloubka rekurze(%d) je vìt¹í, ne¾ max(%d)" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "Neukonèené %c: %s" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "Za %% následuje neparsovatelné makro" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "makro %%%.*s nenalezeno, pøeskakuji" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "Cílový buffer pøetekl" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "Soubor %s: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "Soubor %s je men¹í, ne¾ %d bajtù" @@ -4010,17 +4019,17 @@ msgid "(no error)" msgstr "(chyba: 0x%x)" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "fatální chyba: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "chyba: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "varování: " @@ -4029,42 +4038,42 @@ msgstr "varov msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "alokace pamìti (%u bajtù) vrátila NULL.\n" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "varování: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "varování: u %p data %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "varování: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "Heslo pro %s@%s: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "chyba: %sport musí být èíslo\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "url port musí být èíslo\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "nemohu otevøít %s: %s\n" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" diff --git a/po/da.po b/po/da.po index 5be54ba..a8c5b4a 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "Kan ikke åbne %s/packages.rpm\n" @@ -3041,7 +3041,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3105,7 +3105,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3382,104 +3382,112 @@ msgstr "fjener kataloget %s\n" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "fundet %d pakke(r)\n" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "leder efter pakker til at hente\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "Modtager %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "modtager %d pakker\n" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan ikke åbne fil %s: %s\n" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "Kan ikke åbne %s/packages.rpm\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "installerer binære pakker\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke åbne %s: %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" @@ -3797,141 +3805,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "Succés" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "Tidsudløb for tjener" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "Fil ikke fundet på tjener" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktiv %d tom %d\n" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(tom)" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(tom)\n" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "Makro %%%s har ugyldig navn (%%define)" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3941,17 +3949,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "fatal fejl: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "fejl: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "advarsel: " @@ -3960,42 +3968,42 @@ msgstr "advarsel: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "Adgangskode for %s@%s: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/de.po b/po/de.po index 56e678f..73a2df7 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -45,7 +45,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" @@ -3329,7 +3329,7 @@ msgstr " msgid "old format source packages cannot be queried\n" msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s scheint kein RPM-Paket zu sein\n" @@ -3396,7 +3396,7 @@ msgstr "ung msgid "record %d could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -3681,109 +3681,118 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "Es wurden keine Pakete für die Installation angegeben" + +#: lib/rpminstall.c:205 #, fuzzy msgid "counting packages to install\n" msgstr "Es wurden keine Pakete für die Installation angegeben" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, fuzzy, c-format msgid "found %d packages\n" msgstr "Anfrage an alle Pakete" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 #, fuzzy msgid "looking for packages to download\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, fuzzy, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" # , c-format -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "Hole %s heraus\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 #, fuzzy msgid "installing binary packages\n" msgstr "Paket installieren" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" # oder besser: "... verletzen" ? -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" @@ -4118,151 +4127,151 @@ msgstr "fehlende { nach %{" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 #, fuzzy msgid "Bad server response" msgstr "Nicht passende Antwort des FTP-Servers" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 #, fuzzy msgid "Server IO error" msgstr "FTP IO-Fehler" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 #, fuzzy msgid "Server timeout" msgstr "Timeout des FTP-Servers" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 #, fuzzy msgid "Unable to lookup server host address" msgstr "Unmöglich die Hostadresse des FTP-Servers zu bestimmen" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 #, fuzzy msgid "Unable to lookup server host name" msgstr "Unmöglich den Hostnamen des FTP-Servers zu bestimmen" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 #, fuzzy msgid "Failed to connect to server" msgstr "Verbindung zum FTP-Server fehlgeschlagen" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 #, fuzzy msgid "Failed to establish data connection to server" msgstr "Aufbau einer Datenverbindung zum FTP-Server fehlgeschlagen" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "IO-Fehler bei lokaler Datei" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "Fehler beim Setzen des FTP-Servers in den passiven Modus" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "Datei auf dem Server nicht gefunden" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 #, fuzzy msgid "Unknown or unexpected error" msgstr "FTP Unbekannter oder nicht erwarteter Fehler" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "Paket %s in %s nicht gefunden" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" # , c-format #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, fuzzy, c-format msgid "File %s: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -4273,17 +4282,17 @@ msgid "(no error)" msgstr "Fehler: " #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "Fataler Fehler: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "Fehler: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "Warnung: " @@ -4292,45 +4301,45 @@ msgstr "Warnung: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "Passworf für %s@%s: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 #, fuzzy msgid "url port must be a number\n" msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" # , c-format -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" diff --git a/po/es.po b/po/es.po index 08f25e9..800b7a7 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3073,7 +3073,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3350,104 +3350,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3765,141 +3773,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3909,17 +3917,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3928,42 +3936,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 9b70662..da3155e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -9,7 +9,7 @@ msgstr "" "Xgettext-Options: --default-domain=rpm --add-comments --keyword=_ " "--keyword=N_\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" @@ -3245,7 +3245,7 @@ msgstr "%s:n avaus ei onnistunut: %s\n" msgid "old format source packages cannot be queried\n" msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ei vaikuta RPM-paketilta\n" @@ -3310,7 +3310,7 @@ msgstr "virheellinen paketin numero: %s\n" msgid "record %d could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -3589,107 +3589,116 @@ msgstr "virhe luotaessa hakemistoa %s: %s" msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "asennukselle ei määritelty paketteja" + +#: lib/rpminstall.c:205 #, fuzzy msgid "counting packages to install\n" msgstr "asennukselle ei määritelty paketteja" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, fuzzy, c-format msgid "found %d packages\n" msgstr "kysele kaikki paketit" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 #, fuzzy msgid "looking for packages to download\n" msgstr "virhe etsittäessä pakettia %s\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, fuzzy, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "Haen: %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 #, fuzzy msgid "installing binary packages\n" msgstr "asenna paketti" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" @@ -4020,150 +4029,150 @@ msgstr "puuttuva '{' '%':n j msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 #, fuzzy msgid "Bad server response" msgstr "Virheellinen FTP-palvelijan vastaus" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 #, fuzzy msgid "Server IO error" msgstr "FTP:n IO-virhe" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 #, fuzzy msgid "Server timeout" msgstr "FTP-palvelimen timeout" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 #, fuzzy msgid "Unable to lookup server host address" msgstr "FTP-palvelimen osoitetta ei löytynyt" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 #, fuzzy msgid "Unable to lookup server host name" msgstr "FTP-palvelimen nimeä ei löytynyt" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 #, fuzzy msgid "Failed to connect to server" msgstr "En saanut yhteyttä FTP-palvelijaan" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 #, fuzzy msgid "Failed to establish data connection to server" msgstr "En saanut data-yhteyttä FTP-palvelijaan" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "Paikallisen tiedoston IO-virhe" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "Virhe asetettaessa palvelinta passiiviin moodiin" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 #, fuzzy msgid "Unknown or unexpected error" msgstr "FTP:n tuntematon tai odottamaton virhe" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "paketti %s ei ole %s:ssä" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, fuzzy, c-format msgid "File %s: %s" msgstr "en voinut avata %s: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -4174,17 +4183,17 @@ msgid "(no error)" msgstr "virhe: " #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "vakava virhe: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "virhe: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "varoitus: " @@ -4193,43 +4202,43 @@ msgstr "varoitus: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "%s@%s:n salasana: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "virhe: ftpport pitää olla luku\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 #, fuzzy msgid "url port must be a number\n" msgstr "virhe: ftpport pitää olla luku\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "en voinut avata %s: %s" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" diff --git a/po/fr.po b/po/fr.po index 07a29f0..48f17d9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ msgid "" -msgstr "POT-Creation-Date: 2000-10-28 12:51-0400\n" +msgstr "POT-Creation-Date: 2000-10-31 10:04-0500\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3250,7 +3250,7 @@ msgstr "La construction a msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3315,7 +3315,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a été spécifié pour l'installation" @@ -3593,105 +3593,114 @@ msgstr "impossible d'ouvrir: %s\n" msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "aucun package n'a été spécifié pour l'installation" + +#: lib/rpminstall.c:205 #, fuzzy msgid "counting packages to install\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -4015,142 +4024,142 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, fuzzy, c-format msgid "File %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -4160,17 +4169,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -4179,42 +4188,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" diff --git a/po/gl.po b/po/gl.po index 08f25e9..800b7a7 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3073,7 +3073,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3350,104 +3350,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3765,141 +3773,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3909,17 +3917,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3928,42 +3936,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index 08f25e9..800b7a7 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3073,7 +3073,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3350,104 +3350,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3765,141 +3773,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3909,17 +3917,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3928,42 +3936,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/id.po b/po/id.po index 08f25e9..800b7a7 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3073,7 +3073,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3350,104 +3350,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3765,141 +3773,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3909,17 +3917,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3928,42 +3936,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index 796131a..347db71 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 1.37\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 2000-08-02 13:00+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "get ekki opnað %s/packages.rpm\n" @@ -3036,7 +3036,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3100,7 +3100,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3377,104 +3377,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3792,141 +3800,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "Óþekkt eða óvænt villa" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== virkt %d tómt %d\n" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "+Oþekkt viðfang %c í %s(%s)" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "Fjölvi %%%.*s fanmst ekki. Sleppi" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "Skrá %s: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "Skráin %s er minni en %d bæti" @@ -3936,17 +3944,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "banvæn villa: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "villa: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "aðvörun: " @@ -3955,42 +3963,42 @@ msgstr "a msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "minnisfrátekt (%u bæta) skilaði NULL.\n" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "aðvörun: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "aðvörun: u %p data %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "aðvörun: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "Lykilorð fyrir %s@%s: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "villa: %sport verður að vera tala\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "gátt slóðar verður að vera tala\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "gat ekki opnað %s: %s\n" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "gat ekki búið til %s: %s\n" diff --git a/po/it.po b/po/it.po index 08f25e9..800b7a7 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3073,7 +3073,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3350,104 +3350,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3765,141 +3773,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3909,17 +3917,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3928,42 +3936,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index f76b22c..e50deff 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: EUC-JP\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" @@ -88,7 +88,7 @@ msgstr " # build root [BuildRoot] # net share [¥Í¥Ã¥È¶¦Í­] # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë] -# $Id: ja.po,v 1.118 2000/10/28 17:16:28 jbj Exp $ +# $Id: ja.po,v 1.119 2000/10/31 16:18:39 jbj Exp $ #: rpm.c:184 rpmqv.c:267 #, c-format msgid "rpm: %s\n" @@ -3205,7 +3205,7 @@ msgstr "%s msgid "old format source packages cannot be queried\n" msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" @@ -3270,7 +3270,7 @@ msgstr " msgid "record %d could not be read\n" msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -3551,104 +3551,113 @@ msgstr " msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¿ô¤¨¤Æ¤¤¤Þ¤¹\n" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤òõ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, fuzzy, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "%s ¤È¤·¤Æ...\n" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤·¤Þ¤·¤¿\n" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼ " -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "°Í¸À­¤Î·çÇ¡:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Þ¤¹:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" @@ -3984,150 +3993,150 @@ msgstr "%s msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "À®¸ù" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 #, fuzzy msgid "Bad server response" msgstr "¥µ¡¼¥Ð¤«¤éÀµ¾ï¤Ê±þÅú¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 #, fuzzy msgid "Server IO error" msgstr "¥µ¡¼¥Ð IO ¥¨¥é¡¼" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 #, fuzzy msgid "Server timeout" msgstr "¥µ¡¼¥Ð¥¿¥¤¥à¥¢¥¦¥È" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 #, fuzzy msgid "Unable to lookup server host address" msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È¥¢¥É¥ì¥¹¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 #, fuzzy msgid "Unable to lookup server host name" msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 #, fuzzy msgid "Failed to connect to server" msgstr "¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 #, fuzzy msgid "Failed to establish data connection to server" msgstr "¥µ¡¼¥Ð¤È¤Î¥Ç¡¼¥¿¥³¥Í¥¯¥·¥ç¥ó¤Î³ÎΩ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤Î IO ¥¨¥é¡¼" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "¥ê¥â¡¼¥È¥µ¡¼¥Ð¤Î¥Ñ¥Ã¥·¥Ö¥â¡¼¥ÉÀßÄꥨ¥é¡¼" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "¥µ¡¼¥Ð¾å¤Ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "½èÍýÃæ¤Î¥¢¥Ü¡¼¥È" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 #, fuzzy msgid "Unknown or unexpected error" msgstr "ÉÔÌÀ¤â¤·¤¯¤Ïͽ´ü¤»¤Ì¥¨¥é¡¼" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "%s ¤Ø %s pw %s ¤È¤·¤Æ¥í¥°¥¤¥óÃæ\n" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== ¥¢¥¯¥Æ¥£¥Ö %d ¥¨¥ó¥×¥Æ¥£ %d\n" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "¥Þ¥¯¥í %%%s ¤Ï¥Ü¥Ç¥£¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%define)" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "¥Þ¥¯¥í %%%s ¤Ï opts ¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "¥Þ¥¯¥í %%%s ¤Ï¶õ¤Î¥Ü¥Ç¥£¤Ç¤¹" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "¥Þ¥¯¥í %%%s ¤Ï¿­Ä¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%undefine)" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "¥Þ¥¯¥í %%%s (%s) ¤Ï¥ì¥Ù¥ë %d °Ê²¼¤Ç»ÈÍѤµ¤ì¤Þ¤»¤ó¤Ç¤·¤¿" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)" msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c (%s(%s)Ãæ¤Ë)" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "ºÆµ¢¤Î¿¼¤µ(%d)¤¬ºÇÂçÃÍ(%d)¤è¤ê¤âÂ礭¤¤" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, fuzzy, c-format msgid "Unterminated %c: %s" msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤ %c: %s" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "A %% ¤Ï¹½Ê¸²òÀϤǤ­¤Ê¤¤¥Þ¥¯¥í¤¬Â³¤¤¤Æ¤¤¤Þ¤¹" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "¥Þ¥¯¥í %%%.*s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¡¢¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "¥¿¡¼¥²¥Ã¥È¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¡¼¥Õ¥í¡¼" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "¥Õ¥¡¥¤¥ë %s: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "¥Õ¥¡¥¤¥ë %s: ¤Ï %d ¥Ð¥¤¥È¤è¤ê¾®¤µ¤¤¤Ç¤¹" @@ -4138,17 +4147,17 @@ msgid "(no error)" msgstr "(¥¨¥é¡¼ 0x%x)" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "¥¨¥é¡¼: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "·Ù¹ð: " @@ -4157,43 +4166,43 @@ msgstr " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "%s@%s ¤Î¥Ñ¥¹¥ï¡¼¥É:" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "¥¨¥é¡¼: %s¥Ý¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 #, fuzzy msgid "url port must be a number\n" msgstr "url ¥Ý¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" diff --git a/po/ko.po b/po/ko.po index 08f25e9..800b7a7 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3073,7 +3073,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3350,104 +3350,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3765,141 +3773,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3909,17 +3917,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3928,42 +3936,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/no.po b/po/no.po index 85bb423..f050aa4 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 2000-08-04 02:59+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "kan ikke åpne %s/packages.rpm\n" @@ -3042,7 +3042,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3106,7 +3106,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3383,104 +3383,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke relokeres\n" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "feil under lesing fra fil %s\n" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "fil %s trenger en nyere versjon av RPM\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "feilede avhengigheter:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke åpne %s: %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" @@ -3798,141 +3806,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "Overflyt i målbuffer" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "Fil %s: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "Fil %s er mindre enn %d bytes" @@ -3942,17 +3950,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "fatal feil: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "feil: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "advarsel: " @@ -3961,42 +3969,42 @@ msgstr "advarsel: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "advarseo: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "Passord for %s@%s: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "feil: %s-port må være et tall\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "url-port må være et tall\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "kunne ikke opprette %s: %s\n" diff --git a/po/pl.po b/po/pl.po index 3aa4454..b35a0ea 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" @@ -3185,7 +3185,7 @@ msgstr "otwarcie %s nie powiod msgid "old format source packages cannot be queried\n" msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s nie wygl±da na pakiet RPM\n" @@ -3250,7 +3250,7 @@ msgstr "numer rekordu pakietu: %d\n" msgid "record %d could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -3531,104 +3531,113 @@ msgstr "tworzenie katalogu: %s\n" msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "nie podano nazw plików do zainstalowania" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "zliczanie pakietów do zainstalowania\n" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "znaleziono %d pakietów\n" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "szukanie pakietów do ¶ci±gniêcia\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, fuzzy, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "%s pomijany - transmisja %s nie powiod³a siê\n" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "¦ci±ganie %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "... jako %s\n" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s pomijany - transmisja %s nie powiod³a siê\n" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "¶ci±gniêto %d pakietów\n" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie mo¿na otworzyæ pliku %s: %s" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie mo¿e byæ zainstalowany\n" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "b³±d czytania z pliku %s\n" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "niespe³nione zale¿no¶ci:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "instalacja pakietów binarnych\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" okre¶la wiele pakietów\n" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" @@ -3952,141 +3961,141 @@ msgstr "brak %s\n" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "Sukces" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "B³êdna odpowied¼ serwera" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "B³±d WE/WY(IO) serwera" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "Przekroczony limit czasu serwera" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "Nie mo¿na znale¼æ adresu serwera" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "Nie mo¿na znale¼æ nazwy serwera" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "Po³±czenie z serwerem nie powiod³o siê" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "Otwarcie transmisji danych z serwera nie powiod³o siê" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "B³±d WE/WY(IO) na lokalnym pliku" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "B³±d: ustawienie zdalnego serwera w tryb pasywny nie powiod³o siê" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "Plik nie zosta³ znaleziony na serwerze" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "Przerywanie ..." -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "Nieznany lub nieoczekiwany b³±d" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "logowanie do %s jako %s, has³o %s\n" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktywny %d pusty %d\n" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(pusty)" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(pusty)\n" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "Makro %%%s ma niezakoñczon± strukturê" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "Makro %%%s ma niedozwolon± nazwê (%%define)" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "Makro %%%s ma niezakoñczone opcje" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "Makro %%%s nie zawiera ¿adnych poleceñ" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "Rozwiniêcie makra %%%s nie powiod³o siê" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "Makro %%%s ma niedozwolon± nazwê (%%undefine)" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "Makro %%%s (%s) nie by³o u¿yte poni¿ej poziomu %d" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "Nieznana opcja %c in %s(%s)" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "G³êboko¶æ(%d) rekursji wiêksza mi¿ maks(%d)" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "Niezakoñczone %c: %s" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "Napotkano nieprzetwarzalne makro po %%" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "Nie znaleziono makra %%%.*s, makro pominiête" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "Przepe³nienie bufora docelowego" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "Plik %s: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "Plik %s jest mniejszy ni¿ %d bajtów" @@ -4097,17 +4106,17 @@ msgid "(no error)" msgstr "(b³±d 0x%x)" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "fatalny b³±d: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "b³±d: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "ostrze¿enie: " @@ -4116,42 +4125,42 @@ msgstr "ostrze msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "Has³o dla %s@%s: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "b³±d: %sport musi byæ liczb±\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "port musi byæ liczb±\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" diff --git a/po/pt.po b/po/pt.po index 92b0a6e..69c7d43 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 2000-08-01 21:11+01:00\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-latin1\n" "Content-Transfer-Encoding: none\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3006,7 +3006,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3070,7 +3070,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3349,104 +3349,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3768,141 +3776,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3912,17 +3920,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3931,42 +3939,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 82c4e40..5f74b92 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,9 +2,9 @@ # Revised by Arnaldo Carvalho de Melo , 1998. # msgid "" -msgstr "POT-Creation-Date: 2000-10-28 12:51-0400\n" +msgstr "POT-Creation-Date: 2000-10-31 10:04-0500\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3319,7 +3319,7 @@ msgstr "Constru msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3384,7 +3384,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "não foi passado pacote para instalação" @@ -3683,21 +3683,30 @@ msgstr "RPM vers msgid "failed to remove directory %s: %s\n" msgstr "Não consegui abrir: %s\n" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "não foi passado pacote para instalação" + +#: lib/rpminstall.c:205 #, fuzzy msgid "counting packages to install\n" msgstr "não foi passado pacote para instalação" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, fuzzy, c-format msgid "found %d packages\n" msgstr "pesquise todos os pacotes" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" @@ -3710,92 +3719,92 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, fuzzy, c-format msgid "Retrieving %s\n" msgstr "RPM versão %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" # , c-format -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Não consegui abrir: %s\n" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "não foi passado pacote para instalação" # , c-format -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "Não consegui abrir: %s\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "não foi passado pacote para instalação" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 #, fuzzy msgid "failed dependencies:\n" msgstr "lista dependências do pacote" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 #, fuzzy msgid "installing binary packages\n" msgstr "instale pacote" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 #, fuzzy msgid "removing these packages would break dependencies:\n" msgstr "lista dependências do pacote" # , c-format -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Não consegui abrir: %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -4144,143 +4153,143 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "não foi passado pacote para desinstalação" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" # , c-format #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, fuzzy, c-format msgid "File %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -4290,17 +4299,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -4309,44 +4318,44 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" # , c-format -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "Não consegui abrir: %s\n" # , c-format #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "Não consegui abrir o pipe tar: %s\n" diff --git a/po/ro.po b/po/ro.po index ac9eb21..8c156ca 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3004,7 +3004,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3068,7 +3068,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3345,104 +3345,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3760,141 +3768,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3904,17 +3912,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3923,42 +3931,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 78fd3f5..2d11310 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-10-28 14:36-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3773,141 +3773,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3917,17 +3917,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3936,42 +3936,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 0c16aa7..4d643b9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 2000-08-08 01:20+0300\n" "Last-Translator: Leon Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -10,7 +10,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Date: 1999-04-03 12:20+0200\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ %s/packages.rpm\n" @@ -3090,7 +3090,7 @@ msgstr " msgid "old format source packages cannot be queried\n" msgstr "ÚÁÐÒÏÓÙ Ë SRPM × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ÎÅ ÐÏÈÏÖ ÎÁ ÐÁËÅÔ RPM...\n" @@ -3154,7 +3154,7 @@ msgstr " msgid "record %d could not be read\n" msgstr "ÚÁÐÉÓØ %d ÎÅ ÞÉÔÁÅÔÓÑ\n" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -3433,104 +3433,113 @@ msgstr " msgid "failed to remove directory %s: %s\n" msgstr "ÕÄÁÌÅÎÉÅ ËÁÔÁÌÏÇÁ %s ÎÅ ÕÄÁÌÏÓØ: %s\n" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "ÓÞÉÔÁÀ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ\n" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "ÉÝÕ ÐÁËÅÔÙ ÄÌÑ ÐÏÌÕÞÅÎÉÑ Ó ftp/http\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "ÐÒÏÐÕÓËÁÀ %s - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "ðÏÌÕÞÁÀ %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr " ... ËÁË %s\n" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "ÐÒÏÐÕÓËÁÀ %s - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "ÐÏÌÕÞÅÎÏ %d ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s/packages.rpm\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "ÐÁËÅÔ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ\n" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "ÆÁÊÌ %s ÔÒÅÂÕÅÔ ÂÏÌÅÅ ÎÏ×ÏÊ ×ÅÒÓÉÉ RPM\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÀ %s\n" @@ -3851,141 +3860,141 @@ msgstr " msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "õÄÁÌÏÓØ" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "îÅ×ÅÒÎÙÊ ÏÔ×ÅÔ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "ôÁÊÍÁÕÔ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ IP-ÁÄÒÅÓ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÉÍÑ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "îÅ ÍÏÇÕ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÄÌÑ ÄÁÎÎÙÈ Ó ÓÅÒ×ÅÒÏÍ" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ × ÌÏËÁÌØÎÙÊ ÆÁÊÌ" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "ïÛÉÂËÁ ÐÒÉ ÐÅÒÅ×ÏÄÅ ÕÄÁÌÅÎÎÏÇÏ ÓÅÒ×ÅÒÁ × ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ ÎÁ ÓÅÒ×ÅÒÅ" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "ïÔÍÅÎÁ × ÐÒÏÃÅÓÓÅ" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÉÌÉ ÎÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "ÒÅÇÉÓÔÒÉÒÕÀÓØ × %s ËÁË %s, ÐÁÒÏÌØ %s\n" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== ÁËÔÉ×Î %d ÐÕÓÔ. %d\n" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(ÐÕÓÔÏ)" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(ÐÕÓÔÏ)\n" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "íÁËÒÏÓ %%%s ÓÏÄÅÒÖÉÔ ÎÅÚÁËÒÙÔÏÅ ÔÅÌÏ" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ÎÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%define)" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "íÁËÒÏÓ %%%s ÓÏÄÅÒÖÉÔ ÎÅÚÁËÒÙÔÙÅ ÏÐÃÉÉ" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ÐÕÓÔÏÅ ÔÅÌÏ" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "íÁËÒÏÓ %%%s ÒÁÓËÒÙÔØ ÎÅ ÕÄÁÌÏÓØ" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ÎÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%undefine)" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "íÁËÒÏÓ %%%s (%s) ÎÅ ÂÙÌ ÉÓÐÏÌØÚÏ×ÁÎ ÎÉÖÅ ÕÒÏ×ÎÑ %d" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ %c × %s(%s)" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ(%d) ÂÏÌØÛÅ max(%d)" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "îÅÚÁËÒÙÔÁÑ %c: %s" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "%% Ó ÐÏÓÌÅÄÕÀÝÉÍ ÎÅÒÁÚÂÉÒÁÅÍÙÍ ÍÁËÒÏÓÏÍ" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "íÁËÒÏÓ %s ÎÅ ÎÁÊÄÅÎ, ÐÒÏÐÕÓËÁÀ" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÃÅÌÅ×ÏÇÏ ÂÕÆÅÒÁ" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "æÁÊÌ %s: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "æÁÊÌ %s ÍÅÎØÛÅ %d ÂÁÊÔ" @@ -3996,17 +4005,17 @@ msgid "(no error)" msgstr "(ÏÛÉÂËÁ 0x%x)" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "ÏÛÉÂËÁ: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: " @@ -4015,42 +4024,42 @@ msgstr " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "ðÁÒÏÌØ ÄÌÑ %s@%s: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "ÏÛÉÂËÁ: %sport ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "url port ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s\n" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s\n" diff --git a/po/sk.po b/po/sk.po index 64ff047..5a3b5de 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" @@ -3192,7 +3192,7 @@ msgstr "otvorenie %s zlyhalo\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:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s zrejme nie je RPM balík\n" @@ -3257,7 +3257,7 @@ msgstr "po msgid "record %d could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" @@ -3538,104 +3538,113 @@ msgstr "vytv msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "neboli zadané ¾iadne balíky pre in¹taláciu" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "poèítajú sa balíky pre in¹taláciu\n" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "nájdených %d balíkov\n" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "hµadajú sa balíky, ktoré treba prenies»\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, fuzzy, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "%s vynechané - prenos zlyhal - %s\n" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "Prená¹a sa %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "... ako %s\n" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s vynechané - prenos zlyhal - %s\n" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "prenieslo sa %d balíkov\n" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie je mo¾né otvori» súbor %s: %s" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je mo¾né nain¹talova»\n" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "chyba pri vytváraní doèasného súboru %s" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, 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:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "in¹talujú sa binárne balíky\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¹pecifikuje viac balíkov\n" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "odstránenie týchto balíkov by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" @@ -3960,141 +3969,141 @@ msgstr "ch msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "Úspech" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "Chybná odpoveï servera" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "Chyba vstupu/výstupu servera" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "Prekroèenie èasového limitu servera" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "Nie je mo¾né vyhµada» adresu servera" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "Nie je mo¾né vyhµada» názov servera" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "Pripojenie k serveru zlyhalo" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "Vytvorenie dátového spojenia k serveru zlyhalo" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "Chyba vstupu/výstupu lokálneho súboru" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "Chyba pri nastavení vzdialeného servera do pasívneho re¾imu" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "Súbor sa na serveri nenachádza" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "Zru¹enie prebieha" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "Neznáma alebo neoèakávaná chyba" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "prihlasuje sa na %s ako %s, heslo %s\n" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktívnych %d prázdnych %d\n" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(prázdne)" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(prázdne)\n" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "Makro %%%s obsahuje neukonèené telo" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "Makro %%%s obsahuje chybný názov (%%define)" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "Makro %%%s obsahuje neukonèené voµby" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "Makro %%%s obsahuje prázdne telo" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "Makro %%%s sa nepodarilo expandova»" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "Makro %%%s obsahuje chybný názov (%%undefine)" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "Makro %%%s (%s) nebolo pou¾ité pod úrovòou %d " -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "Neznáma voµba %c v %s(%s)" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "Håbka rekurzie (%d) väè¹ia ako maximálna (%d)" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "Neukonèené %c: %s" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "balík %%%.*s nebol nájdený, vynecháva sa" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "Preplnenie cieµovej vyrovnávacej pamäti" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "Súbor %s: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "Súbor %s je men¹í ako %d bajtov" @@ -4105,17 +4114,17 @@ msgid "(no error)" msgstr "(chyba 0x%x)" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "fatálna chyba: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "chyba: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "varovanie: " @@ -4124,42 +4133,42 @@ msgstr "varovanie: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "Heslo pre %s@%s: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "chyba: %sport musí by» èíslo\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "url port musí by» èíslo\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" diff --git a/po/sl.po b/po/sl.po index 6d98a46..a545fc3 100644 --- a/po/sl.po +++ b/po/sl.po @@ -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 , 2000. -# $Id: sl.po,v 1.103 2000/10/28 17:16:29 jbj Exp $ +# $Id: sl.po,v 1.104 2000/10/31 16:18:41 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 2000-02-17 22:25+01:00\n" "Last-Translator: Primo¾ Peterlin \n" "Language-Team: Slovenian \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "datoteke %s/packages.rpm ni mo¾no odpreti\n" @@ -3179,7 +3179,7 @@ msgstr "odpiranje %s neuspe msgid "old format source packages cannot be queried\n" msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s najverjetneje ni paket RPM\n" @@ -3244,7 +3244,7 @@ msgstr " msgid "record %d could not be read\n" msgstr "zapisa %d ni mo¾no prebrati\n" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" @@ -3523,104 +3523,113 @@ msgstr "ustvarjamo imenik: %s\n" msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "paketi za namestitev niso navedeni" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "¹tetje paketov za namestitev\n" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "najdeno %d paketov\n" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "iskanje paketov za prenos po omre¾ju\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "preskakujemo %s - rpmGlob neuspe¹en(%d)\n" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "Prena¹amo %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr " ... kot %s\n" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "preskakujemo %s - prenos neuspe¹en - %s\n" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "prenesli smo %d paketov\n" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "ni mo¾no odpreti datoteke %s: %s\n" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni mo¾no namestiti\n" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "paketa ni mo¾no odpreti: %s\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "paketa %s ni mo¾no prestaviti\n" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "napaka pri branju iz datoteke %s\n" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "datoteka %s zahteva novej¹o razlièico RPM\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "najdeno %d izvornih in %d binarnih paketov\n" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "neuspe¹ne soodvisnosti:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "name¹èamo binarne pakete\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" doloèa veèterne pakete\n" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "ni mo¾no odpreti %s: %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "Name¹èamo %s\n" @@ -3940,141 +3949,141 @@ msgstr "manjka %s\n" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "Uspe¹no" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "Okvarjen odziv stre¾nika" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "V/I napaka na stre¾niku" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "Potekel èas na stre¾niku" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "Naslov stre¾nika ni ugotovljiv" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "Ime stre¾nika ni ugotovljivo" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "Neuspe¹en poskus prikljuèitve na stre¾nik" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "Neuspe¹na vzpostavitev podatkovne povezave s stre¾nikom" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "V/I napaka na lokalni datoteki" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "Napaka pri nastavitvi oddaljenega stre¾nika v pasivni naèin" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "Datoteke ni mo¾no najti na stre¾niku" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "Prekinitev v teku" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "Neznana ali neprièakovana napaka" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "prijava na %s kot %s, geslo %s\n" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktivni %d prazni %d\n" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(prazni)" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(prazni)\n" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "Makro %%%s vsebuje nezakljuèeno telo" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "Makro %%%s vsebuje nedovoljeno ime (%%define)" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "Makro %%%s vsebuje nezakljuèene izbire" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "Makro %%%s vsebuje prazno telo" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "Makro %%%s se ne raz¹iri" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "Makro %%%s vsebuje nedovoljeno ime (%%undefine)" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "Makro %%%s (%s) ni bil uporabljen pod ravnijo %d" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "Neznana izbira %c v %s(%s)" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "Globina rekurzije (%d) veèja od maksimalne (%d)" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "Nezakljuèeni %c: %s" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "Oznaki %% sledi nerazèlenljiv makro" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "Makro %%%.*s ni najden, preskoèimo" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "Ciljni medpomnilnik prekoraèen" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "Datoteka %s: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "Datoteka %s je kraj¹a od %d bajtov" @@ -4085,17 +4094,17 @@ msgid "(no error)" msgstr "(napaka 0x%x)" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "usodna napaka: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "napaka: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "opozorilo: " @@ -4104,42 +4113,42 @@ msgstr "opozorilo: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "opozorilo: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "opozorilo: u %p data %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "opozorilo: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "Geslo za %s@%s: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "napaka: vrata %s morajo biti ¹tevilka\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "vrata URL morajo biti ¹tevilka\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" diff --git a/po/sr.po b/po/sr.po index 593002f..f04bcb1 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,13 +1,13 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" "Xgettext-Options: --default-domain=rpm --add-comments --keyword=_ " "--keyword=N_\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" @@ -3200,7 +3200,7 @@ msgstr "neuspelo otvaranje %s: %s\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:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ne lièi na RPM paket\n" @@ -3265,7 +3265,7 @@ msgstr "pogre msgid "record %d could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -3544,107 +3544,116 @@ msgstr "gre msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "nedostaje paket za instalaciju" + +#: lib/rpminstall.c:205 #, fuzzy msgid "counting packages to install\n" msgstr "nedostaje paket za instalaciju" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, fuzzy, c-format msgid "found %d packages\n" msgstr "upit nad svim paketima" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 #, fuzzy msgid "looking for packages to download\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, fuzzy, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "Pribavljam %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "gre¹ka: %s se ne mo¾e instalirati\n" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paket %s nije instaliran\n" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "lo¹e meðuzavisnosti:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 #, fuzzy msgid "installing binary packages\n" msgstr "instaliraj paket" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" odreðuje vi¹e paketa\n" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" @@ -3975,150 +3984,150 @@ msgstr "nedostaje { posle %" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 #, fuzzy msgid "Bad server response" msgstr "Lo¹ odgovor FTP servera" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 #, fuzzy msgid "Server IO error" msgstr "Ulazno/izlazna FTP gre¹ka" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 #, fuzzy msgid "Server timeout" msgstr "Tajm-aut FTP servera" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 #, fuzzy msgid "Unable to lookup server host address" msgstr "Ne mogu da odredim host adresu FTP servera" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 #, fuzzy msgid "Unable to lookup server host name" msgstr "Ne mogu da odredim ime FTP hosta" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 #, fuzzy msgid "Failed to connect to server" msgstr "Ne mogu da se pove¾em sa FTP serverom" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 #, fuzzy msgid "Failed to establish data connection to server" msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "Ulazno/izlazna gre¹ka kod lokalne datoteke" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "Gre¹ka kod stavljanja udaljenog servera u pasivni re¾im" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "Datoteka nije pronaðena na serveru" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 #, fuzzy msgid "Unknown or unexpected error" msgstr "Neoèekivana ili nepoznata FTP gre¹ka" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "paket %s nije naðen u %s" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, fuzzy, c-format msgid "File %s: %s" msgstr "neuspelo otvaranje %s: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -4129,17 +4138,17 @@ msgid "(no error)" msgstr "gre¹ka: " #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "fatalna gre¹ka: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "gre¹ka: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "upozorenje: " @@ -4148,43 +4157,43 @@ msgstr "upozorenje: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "Lozinka za %s@%s: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "gre¹ka: FTP port mora biti broj\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 #, fuzzy msgid "url port must be a number\n" msgstr "gre¹ka: FTP port mora biti broj\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "neuspelo otvaranje %s: %s" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" diff --git a/po/sv.po b/po/sv.po index 0afe5bd..041d9a6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: 2000-08-07 16:53+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "kan inte öppna %s/packages.rpm\n" @@ -3073,7 +3073,7 @@ msgstr "misslyckades msgid "old format source packages cannot be queried\n" msgstr "källpaket i gammalt format går ej att fråga om\n" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s verkar inte vara ett RPM-paket\n" @@ -3137,7 +3137,7 @@ msgstr "paketpost nummer: %u\n" msgid "record %d could not be read\n" msgstr "post %d kunde inte läsas\n" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -3440,104 +3440,113 @@ msgstr "tar bort katalog %s\n" msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "inga paket angivna för installation" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "räknar paket att installera\n" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "hittade %d paket\n" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "letar efter paket att hämta\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "hoppar över %s - rpmGlob misslyckades(%d)\n" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "Hämtar %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hoppar över %s - överföring misslyckades - %s\n" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "hämtade %d paket\n" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan inte öppna filen %s: %s\n" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "paket %s är inte relokerbart\n" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "fel vid läsning från fil %s\n" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "filen %s behöver en nyare version av RPM\n" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "hittade %d käll- och %d binärpaket\n" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "ouppfyllda beroenden:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "installerar binärpaket\n" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" @@ -3857,141 +3866,141 @@ msgstr "saknas %s\n" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Ouppfyllda beroenden för %s-%s-%s: " -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "Lyckades" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "Konstigt svar från server" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "IO-fel mot server" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "Förbindelsen med servern dog ut (timeout)" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "Kunde inte slå upp serverns adress" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "Kunde inte slå upp serverns namn" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "Misslyckades med att kontakta servern" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "Misslyckades med att etablera en dataförbindelse till servern" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "IO-fel mot lokal fil" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "Fel när den fjärrservern sattes i passivt läge" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "Filen fanns inte på servern" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "Avbruten under gång" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "Okänt eller oväntat fel" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "loggar in på %s som %s, lösenord %s\n" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktiva %d tomma %d\n" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(tom)" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(tom)\n" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "Makro %%%s har oavslutad kropp" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "Makro %%%s har otillåtet namn (%%define)" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "Makro %%%s har oavslutade flaggor" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "makro %%%s har tom kropp" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "Makro %%%s misslyckades att expandera" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "Makro %%%s har otillåtet namn (%%undefine)" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "Makro %%%s (%s) var inte använd under nivå %d" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "Okänd flagga %c i %s(%s)" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "Rekursionsdjup(%d) större än max(%d)" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "Oavslutad %c: %s" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "Ett %% följs av ett makro som inte kan parsas" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "Inget makro %%%.*s hittat, hoppar över" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "Målbuffer översvämmad" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "Fil %s: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "Filen %s är mindre än %d byte" @@ -4002,17 +4011,17 @@ msgid "(no error)" msgstr "(fel 0x%x)" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "fatalt fel: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "fel: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "varning: " @@ -4021,42 +4030,42 @@ msgstr "varning: " msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "minnesallokering (%u byte) returnerade NULL.\n" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "varning: u %p ctrl %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "varning: u %p data %p nrefs != 0 (%s %s)\n" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "varning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "Lösenord för %s@%s: " -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "fel: %s-port måste vara ett tal\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "url-port måste vara ett tal\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" diff --git a/po/tr.po b/po/tr.po index 3b5157b..f2ac98c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "hata: %s%s/packages.rpm açýlamýyor\n" @@ -3256,7 +3256,7 @@ msgstr "%s 'ye erisimde belirtilen hata olu msgid "old format source packages cannot be queried\n" msgstr "eski tip kaynak paketleri sorgulanamýyor\n" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s bir RPM paketi deðil (gibi)\n" @@ -3321,7 +3321,7 @@ msgstr "ge msgid "record %d could not be read\n" msgstr "%d numaralý kayýt okunamadý\n" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "%s pakedi yüklenmemiþ\n" @@ -3600,107 +3600,116 @@ msgstr "%s dizinin olu msgid "failed to remove directory %s: %s\n" msgstr "%s açýlamadý: %s" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +#, fuzzy +msgid "Preparing packages for installation..." +msgstr "yüklenecek paketler belirtilmedi" + +#: lib/rpminstall.c:205 #, fuzzy msgid "counting packages to install\n" msgstr "yüklenecek paketler belirtilmedi" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, fuzzy, c-format msgid "found %d packages\n" msgstr "Tüm paketleri sorgulama" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 #, fuzzy msgid "looking for packages to download\n" msgstr "%s pakedi aranýrken hata oluþtu\n" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, fuzzy, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "hata: %s atlanýyor - aktarým baþarýsýz - %s\n" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "%s alýnýyor\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hata: %s atlanýyor - aktarým baþarýsýz - %s\n" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "%s dosyasý açýlamýyor: " -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "hata: %s yüklenemedi\n" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "hata: %s%s/packages.rpm açýlamýyor\n" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "%s pakedi yüklenmemiþ\n" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "%s dizinin oluþturulmasýnda hata: %s" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "%s grubu hiç paket içermiyor\n" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "baðýmlýlýk hatasý, aþaðýdaki paketlere ihtiyacýnýz var:\n" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 #, fuzzy msgid "installing binary packages\n" msgstr "paket yüklemek" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanýmlýyor\n" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "bu paketin silinmesi aþaðýdaki baðýmlýlýklarý etkileyecektir:\n" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "hata: %s eriþilemiyor\n" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "%s yükleniyor\n" @@ -4031,150 +4040,150 @@ msgstr "% den sonra eksik {" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "%s-%s-%s 'nin baðýmlýlýk sorunlarý: " -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 #, fuzzy msgid "Bad server response" msgstr "FTP sunucusundan kötü yanýt" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 #, fuzzy msgid "Server IO error" msgstr "FTP I/O hatasý" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 #, fuzzy msgid "Server timeout" msgstr "FTP sunucusu zaman aþýmý" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 #, fuzzy msgid "Unable to lookup server host address" msgstr "FTP sunucusunun isim adres dönüþümü yapýlamadý" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 #, fuzzy msgid "Unable to lookup server host name" msgstr "FTP sunucusunun adres isim dönüþümü yapýlamadý" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 #, fuzzy msgid "Failed to connect to server" msgstr "FTP sunucusuna baðlanýlamadý" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 #, fuzzy msgid "Failed to establish data connection to server" msgstr "FTP sunucusu ile veri alýþveriþi yapýlamadý" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "Yerel dosyaya eriþim sýrasýnda I/O hatasý" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "Karþý sunucuyu pasif kipe sokam hatasý" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "Dosya sunucuda bulunamadý" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 #, fuzzy msgid "Unknown or unexpected error" msgstr "FTP bilinmeyen ya da beklenmeyen hata" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 #, fuzzy msgid "Macro %%%.*s not found, skipping" msgstr "%s pakedi %s içerisinde bulunamadý" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, fuzzy, c-format msgid "File %s: %s" msgstr "%s açýlamadý: %s" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -4185,17 +4194,17 @@ msgid "(no error)" msgstr "hata: " #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "ölümcül hata: " #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "hata: " #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "uyarý: " @@ -4204,43 +4213,43 @@ msgstr "uyar msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "%s'%s için parola" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "hata: ftpport bir sayý olmalý\n" -#: rpmio/url.c:410 +#: rpmio/url.c:416 #, fuzzy msgid "url port must be a number\n" msgstr "hata: ftpport bir sayý olmalý\n" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "%s açýlamadý: %s" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "%s yaratýlamýyor\n" diff --git a/po/uk.po b/po/uk.po index 08f25e9..800b7a7 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3073,7 +3073,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3350,104 +3350,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3765,141 +3773,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3909,17 +3917,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3928,42 +3936,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index 08f25e9..800b7a7 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3073,7 +3073,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3350,104 +3350,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3765,141 +3773,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3909,17 +3917,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3928,42 +3936,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index 08f25e9..800b7a7 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3073,7 +3073,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3350,104 +3350,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3765,141 +3773,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3909,17 +3917,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3928,42 +3936,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 08f25e9..800b7a7 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-28 12:51-0400\n" +"POT-Creation-Date: 2000-10-31 10:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:463 +#: build.c:25 lib/rpminstall.c:532 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:530 lib/rpminstall.c:245 +#: lib/query.c:530 lib/rpminstall.c:311 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -3073,7 +3073,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:708 lib/rpminstall.c:476 +#: lib/query.c:708 lib/rpminstall.c:545 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3350,104 +3350,112 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:139 +#: lib/rpminstall.c:141 +msgid "Preparing..." +msgstr "" + +#: lib/rpminstall.c:144 +msgid "Preparing packages for installation..." +msgstr "" + +#: lib/rpminstall.c:205 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:143 +#: lib/rpminstall.c:209 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:148 +#: lib/rpminstall.c:214 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:163 +#: lib/rpminstall.c:229 #, c-format msgid "skipping %s - rpmGlob failed(%d)\n" msgstr "" -#: lib/rpminstall.c:178 +#: lib/rpminstall.c:244 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:188 +#: lib/rpminstall.c:254 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:192 +#: lib/rpminstall.c:258 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:219 +#: lib/rpminstall.c:285 #, c-format msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:231 lib/rpminstall.c:400 +#: lib/rpminstall.c:297 lib/rpminstall.c:469 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:249 lib/rpminstall.c:541 +#: lib/rpminstall.c:315 lib/rpminstall.c:610 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:330 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:284 +#: lib/rpminstall.c:350 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:329 +#: lib/rpminstall.c:395 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:334 +#: lib/rpminstall.c:400 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:351 +#: lib/rpminstall.c:417 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:362 +#: lib/rpminstall.c:428 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:380 +#: lib/rpminstall.c:449 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:479 +#: lib/rpminstall.c:548 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:502 +#: lib/rpminstall.c:571 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:530 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:536 +#: lib/rpminstall.c:605 #, c-format msgid "Installing %s\n" msgstr "" @@ -3765,141 +3773,141 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/rpmio.c:539 +#: rpmio/rpmio.c:538 msgid "Success" msgstr "" -#: rpmio/rpmio.c:542 +#: rpmio/rpmio.c:541 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:545 +#: rpmio/rpmio.c:544 msgid "Server IO error" msgstr "" -#: rpmio/rpmio.c:548 +#: rpmio/rpmio.c:547 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:551 +#: rpmio/rpmio.c:550 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:554 +#: rpmio/rpmio.c:553 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:557 +#: rpmio/rpmio.c:556 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:560 +#: rpmio/rpmio.c:559 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:563 +#: rpmio/rpmio.c:562 msgid "IO error to local file" msgstr "" -#: rpmio/rpmio.c:566 +#: rpmio/rpmio.c:565 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:569 +#: rpmio/rpmio.c:568 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:572 +#: rpmio/rpmio.c:571 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:575 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1171 +#: rpmio/rpmio.c:1170 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/macro.c:183 +#: rpmio/macro.c:189 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:297 +#: rpmio/macro.c:303 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:338 +#: rpmio/macro.c:344 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:551 +#: rpmio/macro.c:557 msgid "Macro %%%s has unterminated body" msgstr "" -#: rpmio/macro.c:577 +#: rpmio/macro.c:583 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: rpmio/macro.c:583 +#: rpmio/macro.c:589 msgid "Macro %%%s has unterminated opts" msgstr "" -#: rpmio/macro.c:588 +#: rpmio/macro.c:594 msgid "Macro %%%s has empty body" msgstr "" -#: rpmio/macro.c:593 +#: rpmio/macro.c:599 msgid "Macro %%%s failed to expand" msgstr "" -#: rpmio/macro.c:624 +#: rpmio/macro.c:630 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: rpmio/macro.c:717 +#: rpmio/macro.c:723 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: rpmio/macro.c:809 +#: rpmio/macro.c:816 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: rpmio/macro.c:985 +#: rpmio/macro.c:992 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: rpmio/macro.c:1051 rpmio/macro.c:1067 +#: rpmio/macro.c:1058 rpmio/macro.c:1074 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: rpmio/macro.c:1107 +#: rpmio/macro.c:1114 msgid "A %% is followed by an unparseable macro" msgstr "" -#: rpmio/macro.c:1233 +#: rpmio/macro.c:1240 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: rpmio/macro.c:1304 +#: rpmio/macro.c:1311 msgid "Target buffer overflow" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1483 rpmio/macro.c:1489 +#: rpmio/macro.c:1491 rpmio/macro.c:1497 #, c-format msgid "File %s: %s" msgstr "" -#: rpmio/macro.c:1492 +#: rpmio/macro.c:1500 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -3909,17 +3917,17 @@ msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 +#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:86 +#: rpmio/rpmlog.c:87 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:87 +#: rpmio/rpmlog.c:88 msgid "warning: " msgstr "" @@ -3928,42 +3936,42 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:92 +#: rpmio/url.c:95 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:109 +#: rpmio/url.c:114 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:136 +#: rpmio/url.c:142 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:222 +#: rpmio/url.c:228 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:248 rpmio/url.c:274 +#: rpmio/url.c:252 rpmio/url.c:278 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:410 +#: rpmio/url.c:416 msgid "url port must be a number\n" msgstr "" -#: rpmio/url.c:450 +#: rpmio/url.c:456 #, c-format msgid "failed to open %s: %s\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:467 +#: rpmio/url.c:473 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/rpmio/.cvsignore b/rpmio/.cvsignore index 6e78333..eb43718 100644 --- a/rpmio/.cvsignore +++ b/rpmio/.cvsignore @@ -5,5 +5,6 @@ Makefile.in .libs *.la *.lo -trpmio +tdigest tkey +trpmio diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index d64b7cd..551eac5 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -11,7 +11,7 @@ noinst_HEADERS = base64.h rpmio_internal.h ugid.h lib_LTLIBRARIES = librpmio.la librpmio_la_SOURCES = rpmrpc.c rpmio.c rpmio_api.c url.c macro.c \ - base64.c md5.c \ + base64.c digest.c \ ugid.c rpmmalloc.c rpmlog.c # XXX Add internal libtool dependence @@ -30,3 +30,6 @@ trpmio: librpmio.la trpmio.o tkey: librpmio.la tkey.o $(LINK) -o $@ tkey.o librpmio.la $(top_builddir)/popt/libpopt.la + +tdigest: librpmio.la tdigest.o + $(LINK) -o $@ tdigest.o librpmio.la $(top_builddir)/popt/libpopt.la diff --git a/rpmio/base64.c b/rpmio/base64.c index 03e40c9..159d6e3 100644 --- a/rpmio/base64.c +++ b/rpmio/base64.c @@ -11,10 +11,10 @@ static int _debug = 0; int B64decode (const char * s, void ** datap, size_t *lenp) { - static char * b64dec = NULL; + static /*@only@*/ char * b64dec = NULL; unsigned char *t, *te; size_t ns, nt; - int a, b, c, d; + unsigned a, b, c, d; if (s == NULL) return 1; ns = strlen(s); @@ -29,22 +29,22 @@ int B64decode (const char * s, void ** datap, size_t *lenp) b64dec[ c ] = 26 + (c - 'a'); for (c = '0'; c <= '9'; c++) b64dec[ c ] = 52 + (c - '0'); - b64dec['+'] = 62; - b64dec['/'] = 63; - b64dec['='] = 0; + b64dec[(unsigned)'+'] = 62; + b64dec[(unsigned)'/'] = 63; + b64dec[(unsigned)'='] = 0; } nt = (ns / 4) * 3; t = te = xmalloc(nt + 1); while (ns > 0) { - if ((a = b64dec[ *s++ ]) == 0x80) + if ((a = b64dec[ (unsigned)*s++ ]) == 0x80) break; - if ((b = b64dec[ *s++ ]) == 0x80) + if ((b = b64dec[ (unsigned)*s++ ]) == 0x80) break; - if ((c = b64dec[ *s++ ]) == 0x80) + if ((c = b64dec[ (unsigned)*s++ ]) == 0x80) break; - if ((d = b64dec[ *s++ ]) == 0x80) + if ((d = b64dec[ (unsigned)*s++ ]) == 0x80) break; if (_debug) fprintf(stderr, "%7u %02x %02x %02x %02x -> %02x %02x %02x\n", @@ -94,11 +94,11 @@ char * B64encode (const void * str, size_t ns) if (_debug) fprintf(stderr, "%7u %02x %02x %02x -> %02x %02x %02x %02x\n", -(unsigned)ns, s[0], s[1], s[2], -(s[0] >> 2), -((s[0] & 0x3) << 4) | (s[1] >> 4), -((s[1] & 0xf) << 2) | (s[2] >> 6), -(s[2]& 0x3f)); +(unsigned)ns, (unsigned)s[0], (unsigned)s[1], (unsigned)s[2], +(unsigned)(s[0] >> 2), +(unsigned)((s[0] & 0x3) << 4) | (s[1] >> 4), +(unsigned)((s[1] & 0xf) << 2) | (s[2] >> 6), +(unsigned)(s[2]& 0x3f)); c = *s++; *te++ = b64enc[ (c >> 2) ]; *te++ = b64enc[ ((c & 0x3) << 4) | (*s >> 4) ]; @@ -113,7 +113,7 @@ fprintf(stderr, "%7u %02x %02x %02x -> %02x %02x %02x %02x\n", *te++ = '='; continue; } - *te++ = b64enc[ (*s & 0x3f) ]; + *te++ = b64enc[ (int)(*s & 0x3f) ]; s++; --ns; } diff --git a/rpmio/digest.c b/rpmio/digest.c new file mode 100644 index 0000000..f319879 --- /dev/null +++ b/rpmio/digest.c @@ -0,0 +1,525 @@ +/** \ingroup signature + * \file rpmio/digest.c + * + */ + +#include "system.h" + +#include "rpmio_internal.h" + +typedef unsigned int uint32; +typedef unsigned char byte; + +/** + * MD5/SHA1 digest private data. + */ +struct DIGEST_CTX_s { + rpmDigestFlags flags; /*!< Bit(s) to control digest operation. */ + uint32 digestlen; /*!< No. bytes of digest. */ + uint32 datalen; /*!< No. bytes in block of plaintext data. */ + void (*transform) (DIGEST_CTX); /*!< Digest transform. */ + int doByteReverse; /*!< Swap bytes in uint32? */ + uint32 bits[2]; /*!< No. bits of plain text. */ + uint32 digest[8]; /*!< Message digest. */ + byte in[64]; /*!< Next block of plain text. */ +}; + +/* + * This code implements SHA-1 as defined in FIPS publication 180-1. + * Based on SHA code originally posted to sci.crypt by Peter Gutmann + * in message <30ajo5$oe8@ccu2.auckland.ac.nz>. + * Modified to test for endianness on creation of SHA objects by AMK. + * Also, the original specification of SHA was found to have a weakness + * by NSA/NIST. This code implements the fixed version of SHA. + * + * Here's the first paragraph of Peter Gutmann's original posting: + * - The following is my SHA (FIPS 180) code updated to allow use of the "fixed" + * SHA, thanks to Jim Gillogly and an anonymous contributor for the information + * on what's changed in the new version. The fix is a simple change which + * involves adding a single rotate in the initial expansion function. It is + * unknown whether this is an optimal solution to the problem which was + * discovered in the SHA or whether it's simply a bandaid which fixes the + * problem with a minimum of effort (for example the reengineering of a great + * many Capstone chips). + * + * Copyright (C) 1995, A.M. Kuchling + * + * Distribute and use freely; there are no restrictions on further + * dissemination and usage except those imposed by the laws of your + * country of residence. + * + * Adapted to pike and some cleanup by Niels Möller. + * Adapted for rpm use from mhash-0.8.3. + */ + +/** + * The SHA f()-functions. The f1 and f3 functions can be optimized to + * save one boolean operation each - thanks to Rich Schroeppel, + * rcs@cs.arizona.edu for discovering this. + */ +/*#define f1(x,y,z) ( ( x & y ) | ( ~x & z ) ) // Rounds 0-19 */ +#define f1(x,y,z) ( z ^ ( x & ( y ^ z ) ) ) /* Rounds 0-19 */ +#define f2(x,y,z) ( x ^ y ^ z ) /* Rounds 20-39 */ +/*#define f3(x,y,z) ( ( x & y ) | ( x & z ) | ( y & z ) ) // Rounds 40-59 */ +#define f3(x,y,z) ( ( x & y ) | ( z & ( x | y ) ) ) /* Rounds 40-59 */ +#define f4(x,y,z) ( x ^ y ^ z ) /* Rounds 60-79 */ + +/** + * The SHA Mysterious Constants. + */ +#define K1 0x5A827999L /* Rounds 0-19 */ +#define K2 0x6ED9EBA1L /* Rounds 20-39 */ +#define K3 0x8F1BBCDCL /* Rounds 40-59 */ +#define K4 0xCA62C1D6L /* Rounds 60-79 */ + +/** + * 32-bit rotate left - kludged with shifts. + */ +#define ROTL(n,X) ( ( (X) << (n) ) | ( (X) >> ( 32 - (n) ) ) ) + +/** + * The initial expanding function. The hash function is defined over an + * 80-word expanded input array W, where the first 16 are copies of the input + * data, and the remaining 64 are defined by + * + * \verbatim + * W[ i ] = W[ i - 16 ] ^ W[ i - 14 ] ^ W[ i - 8 ] ^ W[ i - 3 ] + * \endverbatim + * + * This implementation generates these values on the fly in a circular + * buffer - thanks to Colin Plumb, colin@nyx10.cs.du.edu for this + * optimization. + * + * The updated SHA changes the expanding function by adding a rotate of 1 + * bit. Thanks to Jim Gillogly, jim@rand.org, and an anonymous contributor + * for this information + */ +#define expand(W,i) ( W[ i & 15 ] = \ + ROTL( 1, ( W[ i & 15 ] ^ W[ (i - 14) & 15 ] ^ \ + W[ (i - 8) & 15 ] ^ W[ (i - 3) & 15 ] ) ) ) + +/** + * The prototype SHA sub-round. + * The fundamental sub-round is: + * + * \verbatim + * a' = e + ROTL( 5, a ) + f( b, c, d ) + k + data; + * b' = a; + * c' = ROTL( 30, b ); + * d' = c; + * e' = d; + * \endverbatim + * + * but this is implemented by unrolling the loop 5 times and renaming the + * variables ( e, a, b, c, d ) = ( a', b', c', d', e' ) each iteration. + * This code is then replicated 20 times for each of the 4 functions, using + * the next 20 values from the W[] array each time. + */ + +#define subRound(a, b, c, d, e, f, k, data) \ + ( e += ROTL( 5, a ) + f( b, c, d ) + k + data, b = ROTL( 30, b ) ) + +/** + * Perform the SHA transformation. Note that this code, like MD5, seems to + * break some optimizing compilers due to the complexity of the expressions + * and the size of the basic block. It may be necessary to split it into + * sections, e.g. based on the four subrounds + * + * Note that this function destroys the data area. + */ + +/** + * The core of the SHA algorithm. + * This alters an existing SHA hash to reflect the addition of 16 longwords + * of new data. + * @param private SHA private data + */ +static void +SHA1Transform(DIGEST_CTX ctx) +{ + uint32 * in = (uint32 *) ctx->in; + uint32 A, B, C, D, E; /* Local vars */ + + /* Set up first buffer and local data buffer */ + A = ctx->digest[0]; + B = ctx->digest[1]; + C = ctx->digest[2]; + D = ctx->digest[3]; + E = ctx->digest[4]; + + /* Heavy mangling, in 4 sub-rounds of 20 interations each. */ + subRound( A, B, C, D, E, f1, K1, in[ 0] ); + subRound( E, A, B, C, D, f1, K1, in[ 1] ); + subRound( D, E, A, B, C, f1, K1, in[ 2] ); + subRound( C, D, E, A, B, f1, K1, in[ 3] ); + subRound( B, C, D, E, A, f1, K1, in[ 4] ); + subRound( A, B, C, D, E, f1, K1, in[ 5] ); + subRound( E, A, B, C, D, f1, K1, in[ 6] ); + subRound( D, E, A, B, C, f1, K1, in[ 7] ); + subRound( C, D, E, A, B, f1, K1, in[ 8] ); + subRound( B, C, D, E, A, f1, K1, in[ 9] ); + subRound( A, B, C, D, E, f1, K1, in[10] ); + subRound( E, A, B, C, D, f1, K1, in[11] ); + subRound( D, E, A, B, C, f1, K1, in[12] ); + subRound( C, D, E, A, B, f1, K1, in[13] ); + subRound( B, C, D, E, A, f1, K1, in[14] ); + subRound( A, B, C, D, E, f1, K1, in[15] ); + subRound( E, A, B, C, D, f1, K1, expand( in, 16 ) ); + subRound( D, E, A, B, C, f1, K1, expand( in, 17 ) ); + subRound( C, D, E, A, B, f1, K1, expand( in, 18 ) ); + subRound( B, C, D, E, A, f1, K1, expand( in, 19 ) ); + + subRound( A, B, C, D, E, f2, K2, expand( in, 20 ) ); + subRound( E, A, B, C, D, f2, K2, expand( in, 21 ) ); + subRound( D, E, A, B, C, f2, K2, expand( in, 22 ) ); + subRound( C, D, E, A, B, f2, K2, expand( in, 23 ) ); + subRound( B, C, D, E, A, f2, K2, expand( in, 24 ) ); + subRound( A, B, C, D, E, f2, K2, expand( in, 25 ) ); + subRound( E, A, B, C, D, f2, K2, expand( in, 26 ) ); + subRound( D, E, A, B, C, f2, K2, expand( in, 27 ) ); + subRound( C, D, E, A, B, f2, K2, expand( in, 28 ) ); + subRound( B, C, D, E, A, f2, K2, expand( in, 29 ) ); + subRound( A, B, C, D, E, f2, K2, expand( in, 30 ) ); + subRound( E, A, B, C, D, f2, K2, expand( in, 31 ) ); + subRound( D, E, A, B, C, f2, K2, expand( in, 32 ) ); + subRound( C, D, E, A, B, f2, K2, expand( in, 33 ) ); + subRound( B, C, D, E, A, f2, K2, expand( in, 34 ) ); + subRound( A, B, C, D, E, f2, K2, expand( in, 35 ) ); + subRound( E, A, B, C, D, f2, K2, expand( in, 36 ) ); + subRound( D, E, A, B, C, f2, K2, expand( in, 37 ) ); + subRound( C, D, E, A, B, f2, K2, expand( in, 38 ) ); + subRound( B, C, D, E, A, f2, K2, expand( in, 39 ) ); + + subRound( A, B, C, D, E, f3, K3, expand( in, 40 ) ); + subRound( E, A, B, C, D, f3, K3, expand( in, 41 ) ); + subRound( D, E, A, B, C, f3, K3, expand( in, 42 ) ); + subRound( C, D, E, A, B, f3, K3, expand( in, 43 ) ); + subRound( B, C, D, E, A, f3, K3, expand( in, 44 ) ); + subRound( A, B, C, D, E, f3, K3, expand( in, 45 ) ); + subRound( E, A, B, C, D, f3, K3, expand( in, 46 ) ); + subRound( D, E, A, B, C, f3, K3, expand( in, 47 ) ); + subRound( C, D, E, A, B, f3, K3, expand( in, 48 ) ); + subRound( B, C, D, E, A, f3, K3, expand( in, 49 ) ); + subRound( A, B, C, D, E, f3, K3, expand( in, 50 ) ); + subRound( E, A, B, C, D, f3, K3, expand( in, 51 ) ); + subRound( D, E, A, B, C, f3, K3, expand( in, 52 ) ); + subRound( C, D, E, A, B, f3, K3, expand( in, 53 ) ); + subRound( B, C, D, E, A, f3, K3, expand( in, 54 ) ); + subRound( A, B, C, D, E, f3, K3, expand( in, 55 ) ); + subRound( E, A, B, C, D, f3, K3, expand( in, 56 ) ); + subRound( D, E, A, B, C, f3, K3, expand( in, 57 ) ); + subRound( C, D, E, A, B, f3, K3, expand( in, 58 ) ); + subRound( B, C, D, E, A, f3, K3, expand( in, 59 ) ); + + subRound( A, B, C, D, E, f4, K4, expand( in, 60 ) ); + subRound( E, A, B, C, D, f4, K4, expand( in, 61 ) ); + subRound( D, E, A, B, C, f4, K4, expand( in, 62 ) ); + subRound( C, D, E, A, B, f4, K4, expand( in, 63 ) ); + subRound( B, C, D, E, A, f4, K4, expand( in, 64 ) ); + subRound( A, B, C, D, E, f4, K4, expand( in, 65 ) ); + subRound( E, A, B, C, D, f4, K4, expand( in, 66 ) ); + subRound( D, E, A, B, C, f4, K4, expand( in, 67 ) ); + subRound( C, D, E, A, B, f4, K4, expand( in, 68 ) ); + subRound( B, C, D, E, A, f4, K4, expand( in, 69 ) ); + subRound( A, B, C, D, E, f4, K4, expand( in, 70 ) ); + subRound( E, A, B, C, D, f4, K4, expand( in, 71 ) ); + subRound( D, E, A, B, C, f4, K4, expand( in, 72 ) ); + subRound( C, D, E, A, B, f4, K4, expand( in, 73 ) ); + subRound( B, C, D, E, A, f4, K4, expand( in, 74 ) ); + subRound( A, B, C, D, E, f4, K4, expand( in, 75 ) ); + subRound( E, A, B, C, D, f4, K4, expand( in, 76 ) ); + subRound( D, E, A, B, C, f4, K4, expand( in, 77 ) ); + subRound( C, D, E, A, B, f4, K4, expand( in, 78 ) ); + subRound( B, C, D, E, A, f4, K4, expand( in, 79 ) ); + + /* Build message digest */ + ctx->digest[0] += A; + ctx->digest[1] += B; + ctx->digest[2] += C; + ctx->digest[3] += D; + ctx->digest[4] += E; +} + +/* + * This code implements the MD5 message-digest algorithm. + * The algorithm is due to Ron Rivest. This code was + * written by Colin Plumb in 1993, no copyright is claimed. + * This code is in the public domain; do with it what you wish. + * + * Equivalent code is available from RSA Data Security, Inc. + * This code has been tested against that, and is equivalent, + * except that you don't need to include two pages of legalese + * with every copy. + * + * To compute the message digest of a chunk of bytes, declare an + * MD5Context structure, pass it to MD5Init, call MD5Update as + * needed on buffers full of bytes, and then call MD5Final, which + * will fill a supplied 16-byte array with the digest. + */ + +/** The four core functions used in MD5 - F1 is optimized somewhat. */ +/* #define F1(x, y, z) (x & y | ~x & z) */ +#define F1(x, y, z) (z ^ (x & (y ^ z))) +#define F2(x, y, z) F1(z, x, y) +#define F3(x, y, z) (x ^ y ^ z) +#define F4(x, y, z) (y ^ (x | ~z)) + +/** The central step in the MD5 algorithm. */ +#define MD5STEP(f, w, x, y, z, data, s) \ + ( w += f(x, y, z) + data, w = w<>(32-s), w += x ) + +/** + * The core of the MD5 algorithm. + * Update MD5 context with next 64 bytes of plain text. + * @param private MD5 private data + */ +static void +MD5Transform(DIGEST_CTX ctx) +{ + register uint32 * in = (uint32 *)ctx->in; + register uint32 a = ctx->digest[0]; + register uint32 b = ctx->digest[1]; + register uint32 c = ctx->digest[2]; + register uint32 d = ctx->digest[3]; + + MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); + MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); + MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); + MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); + MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); + MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); + MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); + MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); + MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); + MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); + MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); + MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); + MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); + MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); + MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); + MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); + + MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); + MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); + MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); + MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); + MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); + MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); + MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); + MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); + MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); + MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); + MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); + MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); + MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); + MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); + MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); + MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); + + MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); + MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); + MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); + MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); + MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); + MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); + MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); + MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); + MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); + MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); + MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); + MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); + MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); + MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); + MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); + MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); + + MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); + MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); + MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); + MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); + MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); + MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); + MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); + MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); + MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); + MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); + MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); + MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); + MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); + MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); + MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); + MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); + + ctx->digest[0] += a; + ctx->digest[1] += b; + ctx->digest[2] += c; + ctx->digest[3] += d; +} + +static int _ie = 0x44332211; +static union _mendian { int i; char b[4]; } *_endian = (union _mendian *)&_ie; +#define IS_BIG_ENDIAN() (_endian->b[0] == '\x44') +#define IS_LITTLE_ENDIAN() (_endian->b[0] == '\x11') + +/* + * Reverse bytes for each integer in buffer. + * @param buf data buffer (uint32 aligned address) + * @param nbytes no. bytes of data (multiple of sizeof(uint32)) + */ +static void +byteReverse(byte *buf, unsigned nbytes) +{ + unsigned nlongs = nbytes / sizeof(uint32); + uint32 t; + do { + t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 | + ((unsigned) buf[1] << 8 | buf[0]); + *(uint32 *) buf = t; + buf += 4; + } while (--nlongs); +} + +DIGEST_CTX +rpmDigestInit(rpmDigestFlags flags) +{ + DIGEST_CTX ctx = xcalloc(1, sizeof(*ctx)); + + ctx->flags = flags; + + if (flags & RPMDIGEST_MD5) { + ctx->digestlen = 16; + ctx->datalen = 64; + ctx->transform = MD5Transform; + ctx->digest[0] = 0x67452301; + ctx->digest[1] = 0xefcdab89; + ctx->digest[2] = 0x98badcfe; + ctx->digest[3] = 0x10325476; + } + + if (flags & RPMDIGEST_SHA1) { + ctx->digestlen = 20; + ctx->datalen = 64; + ctx->transform = SHA1Transform; + ctx->digest[ 0 ] = 0x67452301; + ctx->digest[ 1 ] = 0xefcdab89; + ctx->digest[ 2 ] = 0x98badcfe; + ctx->digest[ 3 ] = 0x10325476; + ctx->digest[ 4 ] = 0xc3d2e1f0; + } + + ctx->doByteReverse = (IS_BIG_ENDIAN()) ? 0 : 1; + if (flags & RPMDIGEST_NATIVE) + ctx->doByteReverse = 0; + + ctx->bits[0] = 0; + ctx->bits[1] = 0; + + return ctx; +} + +void +rpmDigestUpdate(DIGEST_CTX ctx, const void * data, size_t len) +{ + const byte * buf = data; + uint32 t; + + /* Update bitcount */ + + t = ctx->bits[0]; + if ((ctx->bits[0] = t + ((uint32) len << 3)) < t) + ctx->bits[1]++; /* Carry from low to high */ + ctx->bits[1] += len >> 29; + + t = (t >> 3) % ctx->datalen; /* Bytes already in ctx->in */ + + /* Handle any leading odd-sized chunks */ + if (t) { + byte *p = (byte *) ctx->in + t; + + t = ctx->datalen - t; /* Bytes left in ctx->in */ + if (len < t) { + memcpy(p, buf, len); + return; + } + memcpy(p, buf, t); + if (ctx->doByteReverse) + byteReverse(ctx->in, ctx->datalen); + ctx->transform(ctx); + buf += t; + len -= t; + } + + /* Process data in ctx->datalen chunks */ + for (; len >= ctx->datalen; buf += ctx->datalen, len -= ctx->datalen) { + memcpy(ctx->in, buf, ctx->datalen); + if (ctx->doByteReverse) + byteReverse(ctx->in, ctx->datalen); + ctx->transform(ctx); + } + + /* Handle any remaining bytes of data. */ + memcpy(ctx->in, buf, len); +} + +void +rpmDigestFinal(/*@only@*/ DIGEST_CTX ctx, /*@out@*/ void ** datap, + /*@out@*/ size_t *lenp, int asAscii) +{ + unsigned count = (ctx->bits[0] >> 3) % ctx->datalen; + byte * p = ctx->in + count; + + /* Set the first char of padding to 0x80. This is safe since there is + always at least one byte free */ + *p++ = 0x80; + + /* No. bytes of padding needed to fill buffer. */ + count = ctx->datalen - 1 - count; + + /* Insure that next block has room for no. of plaintext bits. */ + if (count < sizeof(ctx->bits)) { + memset(p, 0, count); + if (ctx->doByteReverse) + byteReverse(ctx->in, ctx->datalen); + ctx->transform(ctx); + p = ctx->in; + count = ctx->datalen; + } + + /* Pad next block with zeroes, add no. of plaintext bits. */ + memset(p, 0, count - sizeof(ctx->bits)); + if (ctx->doByteReverse) + byteReverse(ctx->in, ctx->datalen - sizeof(ctx->bits)); + ((uint32 *) ctx->in)[14] = ctx->bits[0]; + ((uint32 *) ctx->in)[15] = ctx->bits[1]; + ctx->transform(ctx); + + /* Return final digest. */ + if (ctx->doByteReverse) + byteReverse((byte *) ctx->digest, ctx->digestlen); + + if (!asAscii) { + if (lenp) *lenp = ctx->digestlen; + if (datap) { + *datap = xmalloc(ctx->digestlen); + memcpy(*datap, ctx->digest, ctx->digestlen); + } + } else { + if (lenp) *lenp = (2*ctx->digestlen) + 1; + if (datap) { + const byte * s = (const byte *) ctx->digest; + static const char hex[] = "0123456789abcdef"; + char * t; + int i; + + *datap = t = xmalloc((2*ctx->digestlen) + 1); + + for (i = 0 ; i < ctx->digestlen; i++) { + *t++ = hex[ (unsigned)((*s >> 4) & 0x0f) ]; + *t++ = hex[ (unsigned)((*s++ ) & 0x0f) ]; + } + *t = '\0'; + } + } + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ + free(ctx); +} diff --git a/rpmio/macro.c b/rpmio/macro.c index 9c37106..66f7672 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -42,6 +42,8 @@ typedef FILE * FD_t; #define Fread fread #define Fclose fclose +#define fdGetFILE(_fd) (_fd) + #else #include @@ -52,6 +54,10 @@ typedef FILE * FD_t; #include +/*@access FD_t@*/ /* XXX compared with NULL */ +/*@access MacroContext@*/ +/*@access MacroEntry@*/ + struct MacroContext rpmGlobalMacroContext; struct MacroContext rpmCLIMacroContext; @@ -59,14 +65,14 @@ struct MacroContext rpmCLIMacroContext; * Macro expansion state. */ typedef struct MacroBuf { - const char *s; /*!< Text to expand. */ - char *t; /*!< Expansion buffer. */ +/*@shared@*/ const char *s; /*!< Text to expand. */ +/*@shared@*/ char *t; /*!< Expansion buffer. */ size_t nb; /*!< No. bytes remaining in expansion buffer. */ int depth; /*!< Current expansion depth. */ int macro_trace; /*!< Pre-print macro to expand? */ int expand_trace; /*!< Post-print macro expansion? */ - void *spec; /*!< (future) %file expansion info. */ - MacroContext *mc; +/*@shared@*/ void *spec; /*!< (future) %file expansion info. */ +/*@dependent@*/ MacroContext *mc; } MacroBuf; #define SAVECHAR(_mb, _c) { *(_mb)->t = (_c), (_mb)->t++, (_mb)->nb--; } @@ -191,7 +197,7 @@ rpmDumpMacroTable(MacroContext * mc, FILE * fp) * @param namelen no. of byes * @return address of slot in macro table with name (or NULL) */ -static MacroEntry ** +/*@dependent@*/ static MacroEntry ** findEntry(MacroContext *mc, const char *name, size_t namelen) { MacroEntry keybuf, *key, **ret; @@ -222,7 +228,7 @@ findEntry(MacroContext *mc, const char *name, size_t namelen) /** * fgets(3) analogue that reads \ continuations. Last newline always trimmed. */ -static char * +/*@dependent@*/ static char * rdcl(char *buf, size_t size, FD_t fd, int escapes) { char *q = buf; @@ -232,7 +238,7 @@ rdcl(char *buf, size_t size, FD_t fd, int escapes) *q = '\0'; do { /* read next line */ - if (fgets(q, size, (FILE *)fdGetFp(fd)) == NULL) + if (fgets(q, size, fdGetFILE(fd)) == NULL) break; nb = strlen(q); nread += nb; @@ -255,7 +261,7 @@ rdcl(char *buf, size_t size, FD_t fd, int escapes) } /** - * Return text between pl and matching pr. + * Return text between pl and matching pr characters. * @param p start of text * @param pl left char, i.e. '[', '(', '{', etc. * @param pr right char, i.e. ']', ')', '}', etc. @@ -521,7 +527,7 @@ doShellEscape(MacroBuf *mb, const char *cmd, size_t clen) * @param expandbody should body be expanded? * @return address to continue parsing */ -static const char * +/*@dependent@*/ static const char * doDefine(MacroBuf *mb, const char *se, int level, int expandbody) { const char *s = se; @@ -605,7 +611,7 @@ doDefine(MacroBuf *mb, const char *se, int level, int expandbody) * @param se macro name to undefine * @return address to continue parsing */ -static const char * +/*@dependent@*/ static const char * doUndefine(MacroContext *mc, const char *se) { const char *s = se; @@ -736,7 +742,7 @@ freeArgs(MacroBuf *mb) * @param lastc stop parsing at lastc * @return address to continue parsing */ -static const char * +/*@dependent@*/ static const char * grabArgs(MacroBuf *mb, const MacroEntry *me, const char *se, char lastc) { char buf[BUFSIZ], *b, *be; @@ -792,6 +798,7 @@ grabArgs(MacroBuf *mb, const MacroEntry *me, const char *se, char lastc) /* Build argv array */ argv = (const char **) alloca((argc + 1) * sizeof(char *)); be[-1] = ' '; /* be - 1 == b + strlen(b) == buf + strlen(buf) */ + buf[0] = '\0'; b = buf; for (c = 0; c < argc; c++) { argv[c] = b; @@ -997,7 +1004,7 @@ expandMacro(MacroBuf *mb) if (*s != '%') break; s++; /* skip first % in %% */ - /* fall thru */ + /*@fallthrough@*/ default: SAVECHAR(mb, c); continue; @@ -1017,7 +1024,7 @@ expandMacro(MacroBuf *mb) while (strchr("!?", *s) != NULL) { switch(*s++) { case '!': - negate = (++negate % 2); + negate = ((negate + 1) % 2); break; case '?': chkexist++; @@ -1073,7 +1080,7 @@ expandMacro(MacroBuf *mb) while (strchr("!?", *f) != NULL) { switch(*f++) { case '!': - negate = (++negate % 2); + negate = ((negate + 1) % 2); break; case '?': chkexist++; @@ -1353,6 +1360,7 @@ rpmDefineMacro(MacroContext *mc, const char *macro, int level) { MacroBuf macrobuf, *mb = ¯obuf; + memset(mb, 0, sizeof(*mb)); /* XXX just enough to get by */ mb->mc = (mc ? mc : &rpmGlobalMacroContext); (void)doDefine(mb, macro, level, 0); @@ -1527,6 +1535,7 @@ rpmExpand(const char *arg, ...) if (arg == NULL) return xstrdup(""); + buf[0] = '\0'; p = buf; pe = stpcpy(p, arg); @@ -1653,6 +1662,7 @@ rpmGetPath(const char *path, ...) if (path == NULL) return xstrdup(""); + buf[0] = '\0'; t = buf; te = stpcpy(t, path); *te = '\0'; @@ -1674,9 +1684,12 @@ rpmGetPath(const char *path, ...) const char * rpmGenPath(const char * urlroot, const char * urlmdir, const char *urlfile) { - const char * xroot = rpmGetPath(urlroot, NULL), * root = xroot; - const char * xmdir = rpmGetPath(urlmdir, NULL), * mdir = xmdir; - const char * xfile = rpmGetPath(urlfile, NULL), * file = xfile; +/*@owned@*/ const char * xroot = rpmGetPath(urlroot, NULL); +/*@dependent@*/ const char * root = xroot; +/*@owned@*/ const char * xmdir = rpmGetPath(urlmdir, NULL); +/*@dependent@*/ const char * mdir = xmdir; +/*@owned@*/ const char * xfile = rpmGetPath(urlfile, NULL); +/*@dependent@*/ const char * file = xfile; const char * result; const char * url = NULL; int nurl = 0; diff --git a/rpmio/md5.c b/rpmio/md5.c deleted file mode 100644 index e380ca1..0000000 --- a/rpmio/md5.c +++ /dev/null @@ -1,334 +0,0 @@ -/** \ingroup signature - * \file rpmio/md5.c - * - * This code implements the MD5 message-digest algorithm. - * The algorithm is due to Ron Rivest. This code was - * written by Colin Plumb in 1993, no copyright is claimed. - * This code is in the public domain; do with it what you wish. - * - * Equivalent code is available from RSA Data Security, Inc. - * This code has been tested against that, and is equivalent, - * except that you don't need to include two pages of legalese - * with every copy. - * - * To compute the message digest of a chunk of bytes, declare an - * MD5Context structure, pass it to MD5Init, call MD5Update as - * needed on buffers full of bytes, and then call MD5Final, which - * will fill a supplied 16-byte array with the digest. - */ - -#include "system.h" - -#include "rpmio_internal.h" - -typedef unsigned int uint32; -typedef unsigned char byte; - -/** - * The MD5 block size and message digest sizes, in bytes. - */ -#define MD5_DATASIZE 64 -#define MD5_DATALEN 16 -#define MD5_DIGESTSIZE 16 -#define MD5_DIGESTLEN 4 - -/** - * MD5 private data. - */ -typedef struct MD5Context_s { - uint32 digest[MD5_DIGESTLEN]; /*!< Message digest. */ - uint32 bits[2]; - byte in[MD5_DATASIZE]; /*!< Data buffer. */ - int doByteReverse; -} * MD5Context; - -static int _ie = 0x44332211; -static union _mendian { int i; char b[4]; } *_endian = (union _mendian *)&_ie; -#define IS_BIG_ENDIAN() (_endian->b[0] == '\x44') -#define IS_LITTLE_ENDIAN() (_endian->b[0] == '\x11') - -/* The four core functions - F1 is optimized somewhat */ - -/* #define F1(x, y, z) (x & y | ~x & z) */ -#define F1(x, y, z) (z ^ (x & (y ^ z))) -#define F2(x, y, z) F1(z, x, y) -#define F3(x, y, z) (x ^ y ^ z) -#define F4(x, y, z) (y ^ (x | ~z)) - -/* This is the central step in the MD5 algorithm. */ -#define MD5STEP(f, w, x, y, z, data, s) \ - ( w += f(x, y, z) + data, w = w<>(32-s), w += x ) - -/** - * The core of the MD5 algorithm. - * This alters an existing MD5 hash to reflect the addition of 16 longwords - * of new data. - * @param private MD5 private data - */ -static void -MD5Transform(void * private) -{ - MD5Context ctx = (MD5Context) private; - register uint32 * in = (uint32 *)ctx->in; - register uint32 a = ctx->digest[0]; - register uint32 b = ctx->digest[1]; - register uint32 c = ctx->digest[2]; - register uint32 d = ctx->digest[3]; - - MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); - MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); - MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); - MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); - MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); - MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); - MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); - MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); - MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); - MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); - MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); - MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); - MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); - MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); - MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); - MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); - - MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); - MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); - MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); - MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); - MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); - MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); - MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); - MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); - MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); - MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); - MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); - MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); - MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); - MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); - MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); - MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); - - MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); - MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); - MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); - MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); - MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); - MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); - MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); - MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); - MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); - MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); - MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); - MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); - MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); - MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); - MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); - MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); - - MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); - MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); - MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); - MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); - MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); - MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); - MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); - MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); - MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); - MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); - MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); - MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); - MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); - MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); - MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); - MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); - - ctx->digest[0] += a; - ctx->digest[1] += b; - ctx->digest[2] += c; - ctx->digest[3] += d; -} - -/* - * Note: this code is harmless on little-endian machines. - */ -static void -byteReverse(byte *buf, unsigned longs) -{ - uint32 t; - do { - t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 | - ((unsigned) buf[1] << 8 | buf[0]); - *(uint32 *) buf = t; - buf += 4; - } while (--longs); -} - -/** - * Initialize MD5 hash. - * Set bit count to 0 and buffer to mysterious initialization constants. - * @param brokenEndian calculate broken MD5 sum? - * @return MD5 private data - */ -static void * -MD5Init(int brokenEndian) -{ - MD5Context ctx = xcalloc(1, sizeof(*ctx)); - - ctx->digest[0] = 0x67452301; - ctx->digest[1] = 0xefcdab89; - ctx->digest[2] = 0x98badcfe; - ctx->digest[3] = 0x10325476; - - ctx->bits[0] = 0; - ctx->bits[1] = 0; - - if (IS_BIG_ENDIAN()) - ctx->doByteReverse = (brokenEndian ? 0 : 1); - else - ctx->doByteReverse = 0; - return ctx; -} - -/** - * Update context to reflect the concatenation of another buffer full - * of bytes. - * @param private private data - * @param data next data buffer - * @param len no. bytes of data - */ -static void -MD5Update(void * private, const void * data, size_t len) -{ - MD5Context ctx = (MD5Context) private; - const byte * buf = data; - uint32 t; - - /* Update bitcount */ - - t = ctx->bits[0]; - if ((ctx->bits[0] = t + ((uint32) len << 3)) < t) - ctx->bits[1]++; /* Carry from low to high */ - ctx->bits[1] += len >> 29; - - t = (t >> 3) & 0x3f; /* Bytes already in ctx->in */ - - /* Handle any leading odd-sized chunks */ - - if (t) { - byte *p = (byte *) ctx->in + t; - - t = MD5_DATASIZE - t; /* Bytes left in ctx->in */ - if (len < t) { - memcpy(p, buf, len); - return; - } - memcpy(p, buf, t); - if (ctx->doByteReverse) - byteReverse(ctx->in, 16); - MD5Transform(ctx); - buf += t; - len -= t; - } - - /* Process data in MD5_DATASIZE chunks */ - - for (; len >= MD5_DATASIZE; buf += MD5_DATASIZE, len -= MD5_DATASIZE) { - memcpy(ctx->in, buf, MD5_DATASIZE); - if (ctx->doByteReverse) - byteReverse(ctx->in, 16); - MD5Transform(ctx); - } - - /* Handle any remaining bytes of data. */ - memcpy(ctx->in, buf, len); -} - -/** - * Return MD5 sum and destroy context. - * Final wrapup - pad to 64-byte boundary with the bit pattern - * 1 0* (64-bit count of bits processed, MSB-first) - * - * @param private private data - * @retval datap address of returned digest - * @retval lenp address of digest length - * @param asAscii return digest as ascii string? - */ -static void -MD5Final(/*@only@*/ void * private, /*@out@*/ void ** datap, - /*@out@*/ size_t *lenp, int asAscii) -{ - MD5Context ctx = (MD5Context) private; - unsigned count; - byte *p; - - /* Compute number of bytes mod 64 */ - count = (ctx->bits[0] >> 3) & 0x3F; - - /* Set the first char of padding to 0x80. This is safe since there is - always at least one byte free */ - p = ctx->in + count; - *p++ = 0x80; - - /* Bytes of padding needed to make 64 bytes */ - count = MD5_DATASIZE - 1 - count; - - /* Pad out to 56 mod 64 */ - if (count < 8) { - /* Two lots of padding: Pad the first block to 64 bytes */ - memset(p, 0, count); - if (ctx->doByteReverse) - byteReverse(ctx->in, 16); - MD5Transform(ctx); - - /* Now fill the next block with 56 bytes */ - memset(ctx->in, 0, 56); - } else { - /* Pad block to 56 bytes */ - memset(p, 0, count - 8); - } - if (ctx->doByteReverse) - byteReverse(ctx->in, 14); - - /* Append length in bits and transform */ - ((uint32 *) ctx->in)[14] = ctx->bits[0]; - ((uint32 *) ctx->in)[15] = ctx->bits[1]; - - MD5Transform(ctx); - - if (ctx->doByteReverse) - byteReverse((byte *) ctx->digest, MD5_DIGESTLEN); - - if (!asAscii) { - if (lenp) *lenp = MD5_DIGESTSIZE; - if (datap) { - *datap = xmalloc(MD5_DIGESTSIZE); - memcpy(*datap, ctx->digest, MD5_DIGESTSIZE); - } - } else { - if (lenp) *lenp = (2*MD5_DIGESTSIZE) + 1; - if (datap) { - const byte * s = (const byte *) ctx->digest; - static const char hex[] = "0123456789abcdef"; - char * t; - int i; - - *datap = t = xmalloc((2*MD5_DIGESTSIZE) + 1); - - for (i = 0 ; i < MD5_DIGESTSIZE; i++) { - *t++ = hex[ (unsigned)((*s >> 4) & 0x0f) ]; - *t++ = hex[ (unsigned)((*s++ ) & 0x0f) ]; - } - *t = '\0'; - } - } - memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ - free(ctx); -} - -/** - * MD5 transform vectors. - */ -FDHASH_t rpmio_md5hash = { - NULL, MD5Init, MD5Update, MD5Final, MD5Transform -}; diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index 70b0c07..06f9822 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -139,9 +139,11 @@ static /*@observer@*/ const char * fdbg(FD_t fd) sprintf(be, "BZD %p fdno %d", fps->fp, fps->fdno); #endif } else if (fps->io == fpio) { + /*@+voidabstract@*/ sprintf(be, "%s %p(%d) fdno %d", (fps->fdno < 0 ? "LIBIO" : "FP"), fps->fp, fileno(((FILE *)fps->fp)), fps->fdno); + /*@=voidabstract@*/ } else { sprintf(be, "??? io %p fp %p fdno %d ???", fps->io, fps->fp, fps->fdno); @@ -189,7 +191,7 @@ DBGIO(fd, (stderr, "==> fdDup(%d) fd %p %s\n", fdno, fd, fdbg(fd))); /*@-refcounttrans@*/ return fd; /*@=refcounttrans@*/ } -static inline int fdSeekNot(void * cookie, /*@unused@*/ _libio_pos_t pos, /*@unused@*/ int whence) { +static inline /*@unused@*/ int fdSeekNot(void * cookie, /*@unused@*/ _libio_pos_t pos, /*@unused@*/ int whence) { FD_t fd = c2f(cookie); FDSANE(fd); /* XXX keep gcc quiet */ return -2; @@ -239,10 +241,7 @@ DBGREFS(fd, (stderr, "--> fd %p -- %d %s at %s:%u %s\n", fd, fd->nrefs, msg, fi if (--fd->nrefs > 0) /*@-refcounttrans@*/ return fd; /*@=refcounttrans@*/ if (fd->stats) free(fd->stats); - if (fd->hash) { - if (fd->hash->private) free(fd->hash->private); - free(fd->hash); - } + if (fd->digest) free(fd->digest); /*@-refcounttrans@*/ free(fd); /*@=refcounttrans@*/ } return NULL; @@ -270,8 +269,8 @@ static inline /*@null@*/ FD_t XfdNew(const char *msg, const char *file, unsigned fd->wr_chunked = 0; fd->syserrno = 0; fd->errcookie = NULL; - fd->stats = calloc(1, sizeof(FDSTAT_t)); - fd->hash = NULL; + fd->stats = xcalloc(1, sizeof(*fd->stats)); + fd->digest = NULL; gettimeofday(&fd->stats->create, NULL); fd->stats->begin = fd->stats->create; /* structure assignment */ @@ -293,7 +292,7 @@ ssize_t fdRead(void * cookie, /*@out@*/ char * buf, size_t count) { rc = read(fdFileno(fd), buf, (count > fd->bytesRemain ? fd->bytesRemain : count)); fdstat_exit(fd, FDSTAT_READ, rc); - if (fd->hash) fd->hash->Update(fd->hash->private, buf, count); + if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); DBGIO(fd, (stderr, "==>\tfdRead(%p,%p,%ld) rc %ld %s\n", cookie, buf, (long)count, (long)rc, fdbg(fd))); @@ -307,7 +306,7 @@ ssize_t fdWrite(void * cookie, const char * buf, size_t count) { if (fd->bytesRemain == 0) return 0; /* XXX simulate EOF */ - if (fd->hash) fd->hash->Update(fd->hash->private, buf, count); + if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); if (fd->wr_chunked) { char chunksize[20]; @@ -1591,9 +1590,12 @@ int ufdClose( /*@only@*/ void * cookie) if (u->urltype == URL_IS_FTP) { /* XXX if not using libio, lose the fp from fpio */ - { FILE * fp = fdGetFILE(fd); + { FILE * fp; + /*@+voidabstract@*/ + fp = fdGetFILE(fd); if (noLibio && fp) fdSetFp(fd, NULL); + /*@=voidabstract@*/ } /* @@ -1662,9 +1664,12 @@ fprintf(stderr, "-> \r\n"); */ /* XXX if not using libio, lose the fp from fpio */ - { FILE * fp = fdGetFILE(fd); + { FILE * fp; + /*@+voidabstract@*/ + fp = fdGetFILE(fd); if (noLibio && fp) fdSetFp(fd, NULL); + /*@=voidabstract@*/ } if (fd->persist && u->httpVersion && @@ -1920,7 +1925,7 @@ DBGIO(fd, (stderr, "==>\tgzdRead(%p,%p,%u) rc %lx %s\n", cookie, buf, (unsigned) } } else if (rc >= 0) { fdstat_exit(fd, FDSTAT_READ, rc); - if (fd->hash) fd->hash->Update(fd->hash->private, buf, count); + if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); } return rc; } @@ -1932,7 +1937,7 @@ static ssize_t gzdWrite(void * cookie, const char * buf, size_t count) { if (fd->bytesRemain == 0) return 0; /* XXX simulate EOF */ - if (fd->hash) fd->hash->Update(fd->hash->private, buf, count); + if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); gzfile = gzdFileno(fd); fdstat_enter(fd, FDSTAT_WRITE); @@ -2105,7 +2110,7 @@ static ssize_t bzdRead(void * cookie, /*@out@*/ char * buf, size_t count) { fd->errcookie = bzerror(bzfile, &zerror); } else if (rc >= 0) { fdstat_exit(fd, FDSTAT_READ, rc); - if (fd->hash) fd->hash->Update(fd->hash->private, buf, count); + if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); } return rc; } @@ -2117,7 +2122,7 @@ static ssize_t bzdWrite(void * cookie, const char * buf, size_t count) { if (fd->bytesRemain == 0) return 0; /* XXX simulate EOF */ - if (fd->hash) fd->hash->Update(fd->hash->private, buf, count); + if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); bzfile = bzdFileno(fd); fdstat_enter(fd, FDSTAT_WRITE); @@ -2131,7 +2136,8 @@ static ssize_t bzdWrite(void * cookie, const char * buf, size_t count) { return rc; } -static inline int bzdSeek(void * cookie, _libio_pos_t pos, int whence) { +static inline int bzdSeek(void * cookie, /*@unused@*/ _libio_pos_t pos, + /*@unused@*/ int whence) { FD_t fd = c2f(cookie); BZDONLY(fd); @@ -2223,7 +2229,9 @@ size_t Fread(void *buf, size_t size, size_t nmemb, FD_t fd) { DBGIO(fd, (stderr, "==> Fread(%p,%u,%u,%p) %s\n", buf, (unsigned)size, (unsigned)nmemb, fd, fdbg(fd))); if (fdGetIo(fd) == fpio) { + /*@+voidabstract@*/ rc = fread(buf, size, nmemb, fdGetFILE(fd)); + /*@=voidabstract@*/ return rc; } @@ -2241,7 +2249,9 @@ size_t Fwrite(const void *buf, size_t size, size_t nmemb, FD_t fd) { DBGIO(fd, (stderr, "==> Fwrite(%p,%u,%u,%p) %s\n", buf, (unsigned)size, (unsigned)nmemb, fd, fdbg(fd))); if (fdGetIo(fd) == fpio) { + /*@+voidabstract@*/ rc = fwrite(buf, size, nmemb, fdGetFILE(fd)); + /*@=voidabstract@*/ return rc; } @@ -2268,7 +2278,9 @@ DBGIO(fd, (stderr, "==> Fseek(%p,%ld,%d) %s\n", fd, (long)offset, whence, fdbg(f if (fdGetIo(fd) == fpio) { FILE *fp; + /*@+voidabstract@*/ fp = fdGetFILE(fd); + /*@=voidabstract@*/ rc = fseek(fp, offset, whence); return rc; } @@ -2290,9 +2302,13 @@ DBGIO(fd, (stderr, "==> Fclose(%p) %s\n", fd, fdbg(fd))); FDSTACK_t * fps = &fd->fps[fd->nfps]; if (fps->io == fpio) { - FILE *fp = fdGetFILE(fd); - int fpno = fileno(fp); + FILE *fp; + int fpno; + /*@+voidabstract@*/ + fp = fdGetFILE(fd); + /*@=voidabstract@*/ + fpno = fileno(fp); /* XXX persistent HTTP/1.1 returns the previously opened fp */ if (fd->nfps > 0 && fpno == -1 && fd->fps[fd->nfps-1].io == ufdio && @@ -2573,7 +2589,9 @@ int Fflush(FD_t fd) { if (fd == NULL) return -1; if (fdGetIo(fd) == fpio) + /*@+voidabstract@*/ return fflush(fdGetFILE(fd)); + /*@=voidabstract@*/ if (fdGetIo(fd) == gzdio) return gzdFlush(fdGetFp(fd)); #if HAVE_BZLIB_H @@ -2592,7 +2610,9 @@ int Ferror(FD_t fd) { int ec; if (fps->io == fpio) { + /*@+voidabstract@*/ ec = ferror(fdGetFILE(fd)); + /*@=voidabstract@*/ } else if (fps->io == gzdio) { ec = (fd->syserrno || fd->errcookie != NULL) ? -1 : 0; #if HAVE_BZLIB_H diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h index 0308550..417536a 100644 --- a/rpmio/rpmio.h +++ b/rpmio/rpmio.h @@ -68,18 +68,18 @@ typedef int fdio_close_function_t (void *cookie); /** \ingroup rpmio */ -typedef /*@null@*/ FD_t fdio_ref_function_t ( /*@only@*/ void * cookie, +typedef /*@only@*/ /*@null@*/ FD_t fdio_ref_function_t ( /*@only@*/ void * cookie, const char * msg, const char * file, unsigned line); /** \ingroup rpmio */ -typedef /*@null@*/ FD_t fdio_deref_function_t ( /*@only@*/ FD_t fd, +typedef /*@only@*/ /*@null@*/ FD_t fdio_deref_function_t ( /*@only@*/ FD_t fd, const char * msg, const char * file, unsigned line); /** \ingroup rpmio */ -typedef /*@null@*/ FD_t fdio_new_function_t (const char * msg, +typedef /*@only@*/ /*@null@*/ FD_t fdio_new_function_t (const char * msg, const char * file, unsigned line); diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index 922e53c..25740ac 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -41,23 +41,51 @@ enum FDSTAT_e { /** \ingroup rpmio * Cumulative statistics for a descriptor. */ -typedef struct { +typedef /*@abstract@*/ struct { struct timeval create; /*!< Structure creation time. */ struct timeval begin; /*!< Operation start time. */ OPSTAT_t ops[4]; /*!< Cumulative statistics. */ -} FDSTAT_t; +} * FDSTAT_t; /** \ingroup rpmio + * Bit(s) to control digest operation. */ -typedef struct { - void * private; - void * (*Init) (int flags); - void (*Update) (void * private, const void * data, size_t len); - void (*Final) (/*@only@*/ void * private, /*@out@*/ void ** datap, /*@out@*/ size_t *lenp, int asAscii); - void (*Transform) (void * private); -} FDHASH_t; +typedef enum rpmDigestFlags_e { + RPMDIGEST_MD5 = (1 << 0), /*!< MD5 digest. */ + RPMDIGEST_SHA1 = (1 << 1), /*!< SHA1 digest. */ + RPMDIGEST_NATIVE = (1 << 16), /*!< Should bytes be reversed? */ +} rpmDigestFlags; + +typedef /*@abstract@*/ struct DIGEST_CTX_s * DIGEST_CTX; -/*@observer@*/ extern FDHASH_t rpmio_md5hash; +/** \ingroup rpmio + * Initialize digest. + * Set bit count to 0 and buffer to mysterious initialization constants. + * @param flags bit(s) to control digest operation + * @return digest private data + */ +DIGEST_CTX rpmDigestInit(rpmDigestFlags flags); + +/** \ingroup rpmio + * Update context to with next plain text buffer. + * @param private private data + * @param data next data buffer + * @param len no. bytes of data + */ +void rpmDigestUpdate(DIGEST_CTX ctx, const void * data, size_t len); + +/** \ingroup rpmio + * Return digest and destroy context. + * Final wrapup - pad to 64-byte boundary with the bit pattern + * 1 0* (64-bit count of bits processed, MSB-first) + * + * @param private private data + * @retval datap address of returned digest + * @retval lenp address of digest length + * @param asAscii return digest as ascii string? + */ +void rpmDigestFinal(/*@only@*/ DIGEST_CTX ctx, /*@out@*/ void ** datap, + /*@out@*/ size_t *lenp, int asAscii); /** \ingroup rpmio * The FD_t File Handle data structure. @@ -83,8 +111,8 @@ struct _FD_s { int syserrno; /* last system errno encountered */ /*@observer@*/ const void *errcookie; /* gzdio/bzdio/ufdio: */ - FDSTAT_t *stats; /* I/O statistics */ -/*@owned@*/ FDHASH_t *hash; /* Hash vectors */ + FDSTAT_t stats; /* I/O statistics */ +/*@owned@*/ DIGEST_CTX digest; /* Digest private data */ int ftpFileDoneNeeded; /* ufdio: (FTP) */ unsigned int firstFree; /* fadio: */ @@ -136,7 +164,9 @@ int ufdClose( /*@only@*/ void * cookie); */ /*@unused@*/ static inline /*@dependent@*/ /*@null@*/ FILE * fdGetFILE(FD_t fd) { FDSANE(fd); + /*@+voidabstract@*/ return ((FILE *)fd->fps[fd->nfps].fp); + /*@=voidabstract@*/ } /** \ingroup rpmio @@ -148,7 +178,7 @@ int ufdClose( /*@only@*/ void * cookie); /** \ingroup rpmio */ -/*@unused@*/ static inline void fdSetFp(FD_t fd, void * fp) { +/*@unused@*/ static inline void fdSetFp(FD_t fd, /*@kept@*/ void * fp) { FDSANE(fd); fd->fps[fd->nfps].fp = fp; } @@ -315,25 +345,37 @@ int ufdClose( /*@only@*/ void * cookie); /** \ingroup rpmio */ /*@unused@*/ static inline void fdInitMD5(FD_t fd) { - fd->hash = xcalloc(1, sizeof(*fd->hash)); - /*@-globstate@*/ - *fd->hash = rpmio_md5hash; /* structure assignment */ - fd->hash->private = (*fd->hash->Init) (0); - /*@=globstate@*/ + fd->digest = rpmDigestInit(RPMDIGEST_MD5); +} + +/** \ingroup rpmio + */ +/*@unused@*/ static inline void fdInitSHA1(FD_t fd) { + fd->digest = rpmDigestInit(RPMDIGEST_SHA1); } /** \ingroup rpmio */ /*@unused@*/ static inline void fdFiniMD5(FD_t fd, void **datap, size_t *lenp, int asAscii) { - if (fd->hash == NULL) { + if (fd->digest == NULL) { + *datap = NULL; + *lenp = 0; + return; + } + rpmDigestFinal(fd->digest, datap, lenp, asAscii); + fd->digest = NULL; +} + +/** \ingroup rpmio + */ +/*@unused@*/ static inline void fdFiniSHA1(FD_t fd, void **datap, size_t *lenp, int asAscii) { + if (fd->digest == NULL) { *datap = NULL; *lenp = 0; return; } - (*fd->hash->Final) (fd->hash->private, datap, lenp, asAscii); - fd->hash->private = NULL; - free(fd->hash); - fd->hash = NULL; + rpmDigestFinal(fd->digest, datap, lenp, asAscii); + fd->digest = NULL; } /*@-shadow@*/ diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c index b6aa333..09ec0c2 100644 --- a/rpmio/rpmlog.c +++ b/rpmio/rpmlog.c @@ -11,7 +11,7 @@ /*@access rpmlogRec @*/ static int nrecs = 0; -static rpmlogRec recs = NULL; +static /*@only@*/ /*@null@*/ rpmlogRec recs = NULL; int rpmlogGetNrecs(void) { @@ -55,12 +55,13 @@ void rpmlogClose (void) nrecs = 0; } -void rpmlogOpen (const char *ident, int option, int facility) +void rpmlogOpen (/*@unused@*/ const char *ident, /*@unused@*/ int option, + /*@unused@*/ int facility) { } static int rpmlogMask = RPMLOG_UPTO( RPMLOG_NOTICE ); -static int rpmlogFacility = RPMLOG_USER; +static /*@unused@*/ int rpmlogFacility = RPMLOG_USER; int rpmlogSetMask (int mask) { @@ -70,7 +71,7 @@ int rpmlogSetMask (int mask) return omask; } -static rpmlogCallback _rpmlogCallback = NULL; +static /*@null@*/ rpmlogCallback _rpmlogCallback = NULL; rpmlogCallback rpmlogSetCallback(rpmlogCallback cb) { @@ -90,11 +91,11 @@ static char *rpmlogMsgPrefix[] = { "D: ", /*!< RPMLOG_DEBUG */ }; -static void vrpmlog (int code, const char *fmt, va_list ap) +static void vrpmlog (unsigned code, const char *fmt, va_list ap) { int pri = RPMLOG_PRI(code); int mask = RPMLOG_MASK(pri); - int fac = RPMLOG_FAC(code); + /*@unused@*/ int fac = RPMLOG_FAC(code); char msgbuf[BUFSIZ], *msg; FILE * msgout = stderr; rpmlogRec rec; @@ -102,7 +103,7 @@ static void vrpmlog (int code, const char *fmt, va_list ap) if ((mask & rpmlogMask) == 0) return; - vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap); + /*@-unrecog@*/ vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap); /*@=unrecog@*/ msgbuf[sizeof(msgbuf) - 1] = '\0'; msg = msgbuf; diff --git a/rpmio/rpmmalloc.c b/rpmio/rpmmalloc.c index 5c878be..c99c6e7 100644 --- a/rpmio/rpmmalloc.c +++ b/rpmio/rpmmalloc.c @@ -8,9 +8,9 @@ #define EXIT_FAILURE 1 #endif -void *vmefail(size_t size) +/*@only@*/ void *vmefail(size_t size) { - fprintf(stderr, _("memory alloc (%u bytes) returned NULL.\n"), size); + fprintf(stderr, _("memory alloc (%u bytes) returned NULL.\n"), (unsigned)size); exit(EXIT_FAILURE); /*@notreached@*/ return NULL; @@ -18,17 +18,19 @@ void *vmefail(size_t size) #if !(HAVE_MCHECK_H && defined(__GNUC__)) -void * xmalloc (size_t size) +/*@only@*/ void * xmalloc (size_t size) { register void *value; if (size == 0) size++; value = malloc (size); if (value == 0) value = vmefail(size); + /*@-compdef@*/ return value; + /*@=compdef@*/ } -void * xcalloc (size_t nmemb, size_t size) +/*@only@*/ void * xcalloc (size_t nmemb, size_t size) { register void *value; if (size == 0) size++; @@ -39,7 +41,7 @@ void * xcalloc (size_t nmemb, size_t size) return value; } -void * xrealloc (void *ptr, size_t size) +/*@only@*/ void * xrealloc (/*@only@*/ void *ptr, size_t size) { register void *value; if (size == 0) size++; @@ -49,7 +51,7 @@ void * xrealloc (void *ptr, size_t size) return value; } -char * xstrdup (const char *str) +/*@only@*/ char * xstrdup (const char *str) { size_t size = strlen(str) + 1; char *newstr = (char *) malloc (size); diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c index 60a27fd..18b7e10 100644 --- a/rpmio/rpmrpc.c +++ b/rpmio/rpmrpc.c @@ -8,6 +8,9 @@ #include #include "ugid.h" +/*@access FD_t@*/ +/*@access urlinfo@*/ + extern int _rpmio_debug; /* =============================================================== */ @@ -537,7 +540,7 @@ static int vfs_parse_filedate(int idx, time_t *t) } static int -vfs_parse_ls_lga (char *p, struct stat *s, char **filename, char **linkname) +vfs_parse_ls_lga (char *p, struct stat *st, char **filename, char **linkname) { int idx, idx2, num_cols; int i; @@ -553,22 +556,22 @@ vfs_parse_ls_lga (char *p, struct stat *s, char **filename, char **linkname) if ((i = vfs_parse_filetype(*(p++))) == -1) goto error; - s->st_mode = i; + st->st_mode = i; if (*p == ' ') /* Notwell 4 */ p++; if (*p == '['){ if (strlen (p) <= 8 || p [8] != ']') goto error; /* Should parse here the Notwell permissions :) */ - if (S_ISDIR (s->st_mode)) - s->st_mode |= (S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR | S_IXUSR | S_IXGRP | S_IXOTH); + if (S_ISDIR (st->st_mode)) + st->st_mode |= (S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR | S_IXUSR | S_IXGRP | S_IXOTH); else - s->st_mode |= (S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR); + st->st_mode |= (S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR); p += 9; } else { if ((i = vfs_parse_filemode(p)) == -1) goto error; - s->st_mode |= i; + st->st_mode |= i; p += 9; /* This is for an extra ACL attribute (HP-UX) */ @@ -580,45 +583,45 @@ vfs_parse_ls_lga (char *p, struct stat *s, char **filename, char **linkname) p_copy = g_strdup(p); num_cols = vfs_split_text (p); - s->st_nlink = atol (columns [0]); - if (s->st_nlink < 0) + st->st_nlink = atol (columns [0]); + if (st->st_nlink < 0) goto error; if (!is_num (1)) #ifdef HACK - s->st_uid = finduid (columns [1]); + st->st_uid = finduid (columns [1]); #else - unameToUid (columns [1], &s->st_uid); + unameToUid (columns [1], &st->st_uid); #endif else - s->st_uid = (uid_t) atol (columns [1]); + st->st_uid = (uid_t) atol (columns [1]); /* Mhm, the ls -lg did not produce a group field */ for (idx = 3; idx <= 5; idx++) if (is_month(columns [idx], NULL) || is_week(columns [idx], NULL) || is_dos_date(columns[idx])) break; - if (idx == 6 || (idx == 5 && !S_ISCHR (s->st_mode) && !S_ISBLK (s->st_mode))) + if (idx == 6 || (idx == 5 && !S_ISCHR (st->st_mode) && !S_ISBLK (st->st_mode))) goto error; /* We don't have gid */ - if (idx == 3 || (idx == 4 && (S_ISCHR(s->st_mode) || S_ISBLK (s->st_mode)))) + if (idx == 3 || (idx == 4 && (S_ISCHR(st->st_mode) || S_ISBLK (st->st_mode)))) idx2 = 2; else { /* We have gid field */ if (is_num (2)) - s->st_gid = (gid_t) atol (columns [2]); + st->st_gid = (gid_t) atol (columns [2]); else #ifdef HACK - s->st_gid = findgid (columns [2]); + st->st_gid = findgid (columns [2]); #else - gnameToGid (columns [1], &s->st_gid); + gnameToGid (columns [1], &st->st_gid); #endif idx2 = 3; } /* This is device */ - if (S_ISCHR (s->st_mode) || S_ISBLK (s->st_mode)){ + if (S_ISCHR (st->st_mode) || S_ISBLK (st->st_mode)){ int maj, min; if (!is_num (idx2) || sscanf(columns [idx2], " %d,", &maj) != 1) @@ -628,33 +631,33 @@ vfs_parse_ls_lga (char *p, struct stat *s, char **filename, char **linkname) goto error; #ifdef HAVE_ST_RDEV - s->st_rdev = ((maj & 0xff) << 8) | (min & 0xffff00ff); + st->st_rdev = ((maj & 0xff) << 8) | (min & 0xffff00ff); #endif - s->st_size = 0; + st->st_size = 0; } else { /* Common file size */ if (!is_num (idx2)) goto error; - s->st_size = (size_t) atol (columns [idx2]); + st->st_size = (size_t) atol (columns [idx2]); #ifdef HAVE_ST_RDEV - s->st_rdev = 0; + st->st_rdev = 0; #endif } - idx = vfs_parse_filedate(idx, &s->st_mtime); + idx = vfs_parse_filedate(idx, &st->st_mtime); if (!idx) goto error; /* Use resulting time value */ - s->st_atime = s->st_ctime = s->st_mtime; - s->st_dev = 0; - s->st_ino = 0; + st->st_atime = st->st_ctime = st->st_mtime; + st->st_dev = 0; + st->st_ino = 0; #ifdef HAVE_ST_BLKSIZE - s->st_blksize = 512; + st->st_blksize = 512; #endif #ifdef HAVE_ST_BLOCKS - s->st_blocks = (s->st_size + 511) / 512; + st->st_blocks = (st->st_size + 511) / 512; #endif for (i = idx + 1, idx2 = 0; i < num_cols; i++ ) @@ -663,31 +666,31 @@ vfs_parse_ls_lga (char *p, struct stat *s, char **filename, char **linkname) break; } - if (((S_ISLNK (s->st_mode) || - (num_cols == idx + 3 && s->st_nlink > 1))) /* Maybe a hardlink? (in extfs) */ + if (((S_ISLNK (st->st_mode) || + (num_cols == idx + 3 && st->st_nlink > 1))) /* Maybe a hardlink? (in extfs) */ && idx2){ - int p; - char *s; + int tlen; + char *t; if (filename){ #ifdef HACK - s = g_strndup (p_copy + column_ptr [idx], column_ptr [idx2] - column_ptr [idx] - 1); + t = g_strndup (p_copy + column_ptr [idx], column_ptr [idx2] - column_ptr [idx] - 1); #else int nb = column_ptr [idx2] - column_ptr [idx] - 1; - s = xmalloc(nb+1); - strncpy(s, p_copy + column_ptr [idx], nb); + t = xmalloc(nb+1); + strncpy(t, p_copy + column_ptr [idx], nb); #endif - *filename = s; + *filename = t; } if (linkname){ - s = g_strdup (p_copy + column_ptr [idx2+1]); - p = strlen (s); - if (s [p-1] == '\r' || s [p-1] == '\n') - s [p-1] = 0; - if (s [p-2] == '\r' || s [p-2] == '\n') - s [p-2] = 0; + t = g_strdup (p_copy + column_ptr [idx2+1]); + tlen = strlen (t); + if (t [tlen-1] == '\r' || t [tlen-1] == '\n') + t [tlen-1] = 0; + if (t [tlen-2] == '\r' || t [tlen-2] == '\n') + t [tlen-2] = 0; - *linkname = s; + *linkname = t; } } else { /* Extract the filename from the string copy, not from the columns @@ -697,18 +700,18 @@ vfs_parse_ls_lga (char *p, struct stat *s, char **filename, char **linkname) /* *filename = g_strdup (columns [idx++]); */ - int p; - char *s; + int tlen; + char *t; - s = g_strdup (p_copy + column_ptr [idx++]); - p = strlen (s); + t = g_strdup (p_copy + column_ptr [idx++]); + tlen = strlen (t); /* g_strchomp(); */ - if (s [p-1] == '\r' || s [p-1] == '\n') - s [p-1] = 0; - if (s [p-2] == '\r' || s [p-2] == '\n') - s [p-2] = 0; + if (t [tlen-1] == '\r' || t [tlen-1] == '\n') + t [tlen-1] = 0; + if (t [tlen-2] == '\r' || t [tlen-2] == '\n') + t [tlen-2] = 0; - *filename = s; + *filename = t; } if (linkname) *linkname = NULL; @@ -741,7 +744,7 @@ typedef enum { DO_FTP_GLOB = 5 } ftpSysCall_t; static size_t ftpBufAlloced = 0; -static char * ftpBuf = NULL; +static /*@only@*/ char * ftpBuf = NULL; #define alloca_strdup(_s) strcpy(alloca(strlen(_s)+1), (_s)) @@ -943,7 +946,7 @@ static int ftpGlob(const char * path, int flags, return -2; rc = ftpNLST(path, DO_FTP_GLOB, NULL, NULL, 0); if (_rpmio_debug) -fprintf(stderr, "*** ftpGlob(%s,0x%x,%p,%p) ftpNLST rc %d\n", path, flags, errfunc, pglob, rc); +fprintf(stderr, "*** ftpGlob(%s,0x%x,%p,%p) ftpNLST rc %d\n", path, (unsigned)flags, errfunc, pglob, rc); if (rc) return rc; rc = poptParseArgvString(ftpBuf, &pglob->gl_pathc, (const char ***)&pglob->gl_pathv); @@ -1057,7 +1060,7 @@ int Glob(const char *path, int flags, int ut = urlPath(path, &lpath); if (_rpmio_debug) -fprintf(stderr, "*** Glob(%s,0x%x,%p,%p)\n", path, flags, errfunc, pglob); +fprintf(stderr, "*** Glob(%s,0x%x,%p,%p)\n", path, (unsigned)flags, errfunc, pglob); switch (ut) { case URL_IS_FTP: /* XXX WRONG WRONG WRONG */ return ftpGlob(path, flags, errfunc, pglob); diff --git a/rpmio/rpmurl.h b/rpmio/rpmurl.h index e0379d6..b62f037 100644 --- a/rpmio/rpmurl.h +++ b/rpmio/rpmurl.h @@ -100,7 +100,8 @@ urltype urlIsURL(const char * url) /*@*/; * @retval pathp pointer to path component of url * @return type of url */ -urltype urlPath(const char * url, /*@out@*/ const char ** pathp) /*@*/; +urltype urlPath(const char * url, /*@out@*/ const char ** pathp) + /*@modifies *pathp@*/; /** * Parse URL string into a control structure. diff --git a/rpmio/tdigest.c b/rpmio/tdigest.c new file mode 100644 index 0000000..b1e7d64 --- /dev/null +++ b/rpmio/tdigest.c @@ -0,0 +1,61 @@ +#include "system.h" + +#include "rpmio_internal.h" +#include "popt.h" + +static rpmDigestFlags flags = RPMDIGEST_MD5; + +#define _POPT_SET_BIT (POPT_ARG_VAL|POPT_ARGFLAG_OR) + +static struct poptOption optionsTable[] = { + { "md5", '\0', _POPT_SET_BIT, &flags, RPMDIGEST_MD5, NULL, NULL }, + { "sha1",'\0', _POPT_SET_BIT, &flags, RPMDIGEST_SHA1, NULL, NULL }, + { "native",'\0', _POPT_SET_BIT, &flags, RPMDIGEST_NATIVE, NULL, NULL }, + { NULL, '\0', 0, NULL, 0, NULL, NULL } +}; + +int +main(int argc, const char *argv[]) +{ + poptContext optCon; + const char ** args; + const char *fn; + int rc; + + optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0); + while ((rc = poptGetNextOpt(optCon)) > 0) + ; + + args = poptGetArgs(optCon); + rc = 0; + while ((fn = *args++) != NULL) { + FD_t fd = Fopen(fn, "r.ufdio"); + unsigned char buf[BUFSIZ]; + ssize_t nb; + DIGEST_CTX ctx; + const char * digest; + size_t digestlen; + + if (fd == NULL || Ferror(fd)) { + fprintf(stderr, _("cannot open %s: %s\n"), fn, Fstrerror(fd)); + if (fd) Fclose(fd); + rc++; + continue; + } + + ctx = rpmDigestInit(flags); + + while ((nb = Fread(buf, 1, sizeof(buf), fd)) > 0) + rpmDigestUpdate(ctx, buf, nb); + Fclose(fd); + + rpmDigestFinal(ctx, (void **)&digest, &digestlen, 1); + + if (digest) { + fprintf(stdout, "%s %s\n", digest, fn); + fflush(stdout); + xfree(digest); + } + } + return rc; +} diff --git a/rpmio/url.c b/rpmio/url.c index 8020756..91b65a6 100644 --- a/rpmio/url.c +++ b/rpmio/url.c @@ -17,6 +17,7 @@ #include #include + #ifndef IPPORT_FTP #define IPPORT_FTP 21 #endif @@ -24,6 +25,7 @@ #define IPPORT_HTTP 80 #endif +/*@access FD_t@*/ /* XXX compared with NULL */ /*@access urlinfo@*/ #define URL_IOBUF_SIZE 4096 @@ -74,7 +76,7 @@ urlinfo XurlFree(urlinfo u, const char *msg, const char *file, unsigned line) URLSANE(u); URLDBGREFS(0, (stderr, "--> url %p -- %d %s at %s:%u\n", u, u->nrefs, msg, file, line)); if (--u->nrefs > 0) - return u; + /*@-refcounttrans@*/ return u; /*@=refcounttrans@*/ if (u->ctrl) { #ifndef NOTYET void * fp = fdGetFp(u->ctrl); @@ -88,9 +90,11 @@ URLDBGREFS(0, (stderr, "--> url %p -- %d %s at %s:%u\n", u, u->nrefs, msg, file, #endif u->ctrl = fdio->_fdderef(u->ctrl, "persist ctrl (urlFree)", file, line); + /*@-usereleased@*/ if (u->ctrl) fprintf(stderr, _("warning: u %p ctrl %p nrefs != 0 (%s %s)\n"), u, u->ctrl, u->host, u->service); + /*@=usereleased@*/ } if (u->data) { #ifndef NOTYET @@ -105,9 +109,11 @@ URLDBGREFS(0, (stderr, "--> url %p -- %d %s at %s:%u\n", u, u->nrefs, msg, file, #endif u->data = fdio->_fdderef(u->data, "persist data (urlFree)", file, line); + /*@-usereleased@*/ if (u->data) fprintf(stderr, _("warning: u %p data %p nrefs != 0 (%s %s)\n"), u, u->data, u->host, u->service); + /*@=usereleased@*/ } if (u->buf) { free(u->buf); @@ -230,9 +236,7 @@ static void urlFind(urlinfo *uret, int mustAsk) if (proxy && *proxy != '%') { const char *uu = (u->user ? u->user : "anonymous"); char *nu = xmalloc(strlen(uu) + sizeof("@") + strlen(u->host)); - strcpy(nu, uu); - strcat(nu, "@"); - strcat(nu, u->host); + (void) stpcpy( stpcpy( stpcpy(nu, uu), "@"), u->host); u->proxyu = nu; u->proxyh = xstrdup(proxy); } @@ -338,7 +342,9 @@ urltype urlPath(const char * url, const char ** pathp) break; } if (pathp) + /*@-observertrans@*/ *pathp = path; + /*@=observertrans@*/ return urltype; } diff --git a/system.h b/system.h index 6771080..5cdbd9e 100644 --- a/system.h +++ b/system.h @@ -207,9 +207,9 @@ char *alloca (); /*@only@*/ void * xmalloc (size_t size); /*@only@*/ void * xcalloc (size_t nmemb, size_t size); -/*@only@*/ void * xrealloc (void *ptr, size_t size); +/*@only@*/ void * xrealloc (/*@only@*/ void *ptr, size_t size); /*@only@*/ char * xstrdup (const char *str); -void *vmefail(size_t size); +/*@only@*/ void *vmefail(size_t size); #if HAVE_MCHECK_H #include -- 2.7.4