summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2000-10-31 16:18:34 +0000
committerjbj <devnull@localhost>2000-10-31 16:18:34 +0000
commitce1e8d26ec5c76550c59fa30b6e6787e21f866e0 (patch)
tree3a3eba857ddc88c3367cbebb80e7800945ab9bbc /po
parentd69a6f7c1c4901dd48ca730937ce67886fbf2c61 (diff)
downloadrpm-ce1e8d26ec5c76550c59fa30b6e6787e21f866e0.tar.gz
rpm-ce1e8d26ec5c76550c59fa30b6e6787e21f866e0.tar.bz2
rpm-ce1e8d26ec5c76550c59fa30b6e6787e21f866e0.zip
- add support for SHA1 as well as MD5 message digests.
lclint annotations. CVS patchset: 4234 CVS date: 2000/10/31 16:18:34
Diffstat (limited to 'po')
-rw-r--r--po/cs.po145
-rw-r--r--po/da.po144
-rw-r--r--po/de.po145
-rw-r--r--po/es.po144
-rw-r--r--po/fi.po145
-rw-r--r--po/fr.po145
-rw-r--r--po/gl.po144
-rw-r--r--po/hu.po144
-rw-r--r--po/id.po144
-rw-r--r--po/is.po144
-rw-r--r--po/it.po144
-rw-r--r--po/ja.po147
-rw-r--r--po/ko.po144
-rw-r--r--po/no.po144
-rw-r--r--po/pl.po145
-rw-r--r--po/pt.po144
-rw-r--r--po/pt_BR.po145
-rw-r--r--po/ro.po144
-rw-r--r--po/rpm.pot88
-rw-r--r--po/ru.po145
-rw-r--r--po/sk.po145
-rw-r--r--po/sl.po147
-rw-r--r--po/sr.po145
-rw-r--r--po/sv.po145
-rw-r--r--po/tr.po145
-rw-r--r--po/uk.po144
-rw-r--r--po/wa.po144
-rw-r--r--po/zh.po144
-rw-r--r--po/zh_CN.GB2312.po144
29 files changed, 2187 insertions, 1950 deletions
diff --git a/po/cs.po b/po/cs.po
index b8f4aa2e5..bc0741b38 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 <milan.kerslager@spsselib.hiedu.cz>\n"
"Language-Team: Czech <cs@li.org>\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ření %s selhalo: %s\n"
msgid "old format source packages cannot be queried\n"
msgstr "nelze provést dotaz na zdrojové balíčky starého formátu\n"
-#: lib/query.c: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áznam balíčku číslo: %u\n"
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žu adresář %s\n"
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í %s\n"
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ání: "
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 5be54ba1c..a8c5b4a9c 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 <kenneth@gnu.org>\n"
"Language-Team: Danish/Dansk <dansk@klid.dk>\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 56e678f82..73a2df757 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 <ke@SuSE.DE>\n"
"Language-Team: German <de@li.org>\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 "öffnen von %s fehlgeschlagen: %s\n"
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ültige Paket-Nummer: %s\n"
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 08f25e980..800b7a706 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 9b7066242..da3155e49 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 <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\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älkeen"
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 07a29f060..48f17d964 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 échoué.\n"
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 08f25e980..800b7a706 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 08f25e980..800b7a706 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 08f25e980..800b7a706 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 796131ad6..347db7149 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 <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.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đvörun: "
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 08f25e980..800b7a706 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 f76b22c5e..e50deff94 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 <kanda@nn.iij4u.or.jp>\n"
"Language-Team: JRPM <jrpm@linux.or.jp>\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 "ĽżĄźĽ˛ĽĂĽČ %s ÍѤ˺îŔŽĂć\n"
# 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 ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n"
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 "ĽŃĽĂĽąĄźĽ¸ĽěĽłĄźĽÉČÖšć %d\n"
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 "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
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 ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó\n"
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 08f25e980..800b7a706 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 85bb42333..f050aa4aa 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 <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\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 3aa44548e..b35a0ea44 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 <pdziekonski@mml.ch.pwr.wroc.pl>\n"
"Language-Team: Polish <pl@li.org>\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ło się\n"
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żenie: "
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 92b0a6ec5..69c7d4327 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 <morais@poli.org>\n"
"Language-Team: pt <morais@poli.org>\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 82c4e40b8..5f74b9239 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,9 +2,9 @@
# Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 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çăo falhou.\n"
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ăo %s\n"
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 ac9eb213a..8c156ca57 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 <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\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 78fd3f553..2d11310cc 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 0c16aa768..4d643b9d6 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 <leon@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\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 "ĎÔËŇŮÔÉĹ %s ÎĹ ŐÄÁĚĎÓŘ\n"
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 "ÚÁĐÉÓŘ ĐÁËĹÔÁ ÎĎÍĹŇ %d\n"
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 "ÓĎÚÄÁŔ ËÁÔÁĚĎÇ: %s\n"
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 "ĎÔÓŐÔÓÔ×ŐĹÔ %s\n"
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 64ff0470e..5a3b5de88 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 <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\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žaduje sa záznam číslo %d\n"
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ára sa adresár %s\n"
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ýbajúce %s\n"
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 6d98a46dc..a545fc324 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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 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 <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <sl@li.org>\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šno: %s\n"
msgid "old format source packages cannot be queried\n"
msgstr "poizvedba po izvornih paketih v stari obliki ni možna\n"
-#: lib/query.c: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 "številka zapisa paketa: %d\n"
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 593002fa5..f04bcb120 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 <ewt@lacrosse.redhat.com>\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šan broj paketa: %s\n"
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ška kod kreiranja direktorijuma %s: %s"
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 0afe5bdbb..041d9a647 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 <göran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\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 öppna %s: %s\n"
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 3b5157ba5..f2ac98c4c 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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ţtu: %s\n"
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çersiz paket numarsý: %s\n"
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ţturulmasýnda hata: %s"
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 08f25e980..800b7a706 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 08f25e980..800b7a706 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 08f25e980..800b7a706 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 08f25e980..800b7a706 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 ""