summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2001-04-23 20:56:59 +0000
committerjbj <devnull@localhost>2001-04-23 20:56:59 +0000
commita71985e5be5051164d089b1424130d0f303ff3c0 (patch)
treec048803a0a540b554bc9b4a5c9b46ff4359c5a01 /po
parent1aaf1b9b5d3777a36f9cfff600912a7f468dc732 (diff)
downloadrpm-a71985e5be5051164d089b1424130d0f303ff3c0.tar.gz
rpm-a71985e5be5051164d089b1424130d0f303ff3c0.tar.bz2
rpm-a71985e5be5051164d089b1424130d0f303ff3c0.zip
- regenerate rpm.8 man page from docbook glop (in max-rpm).
- lib/depends.c: diddle debugging messages. CVS patchset: 4703 CVS date: 2001/04/23 20:56:59
Diffstat (limited to 'po')
-rw-r--r--po/cs.po558
-rw-r--r--po/da.po538
-rw-r--r--po/de.po570
-rw-r--r--po/es.po519
-rw-r--r--po/eu_ES.po519
-rw-r--r--po/fi.po570
-rw-r--r--po/fr.po548
-rw-r--r--po/gl.po519
-rw-r--r--po/hu.po519
-rw-r--r--po/id.po519
-rw-r--r--po/is.po525
-rw-r--r--po/it.po519
-rw-r--r--po/ja.po559
-rw-r--r--po/ko.po519
-rw-r--r--po/no.po531
-rw-r--r--po/pl.po565
-rw-r--r--po/pt.po523
-rw-r--r--po/pt_BR.po555
-rw-r--r--po/ro.po519
-rw-r--r--po/rpm.pot231
-rw-r--r--po/ru.po558
-rw-r--r--po/sk.po565
-rw-r--r--po/sl.po564
-rw-r--r--po/sr.po570
-rw-r--r--po/sv.po558
-rw-r--r--po/tr.po570
-rw-r--r--po/uk.po519
-rw-r--r--po/wa.po519
-rw-r--r--po/zh.po519
-rw-r--r--po/zh_CN.GB2312.po519
30 files changed, 7878 insertions, 8008 deletions
diff --git a/po/cs.po b/po/cs.po
index a76ecca97..58bb4cbd3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: 2000-08-23 22:24+0100\n"
"Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -391,11 +391,11 @@ msgstr "číslo portu http serveru (nebo proxy)"
msgid "query mode"
msgstr "režim dotazů"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr " --dbpath <adr> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "použít <adr> jako adresář pro databázi"
@@ -411,7 +411,7 @@ msgstr "použít <qfmt> jako hlavičkový formát (implikuje -i)"
msgid " --root <dir> "
msgstr " --root <adr> "
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "použít <adr> jako adresář nejvyšší úrovně"
@@ -669,6 +669,11 @@ msgstr ""
msgid " --erase <package>"
msgstr " --erase <balíček>"
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " -i <balíček> "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "smazat (deinstalovat) balíček"
@@ -762,19 +767,11 @@ msgstr "sestavit balíček pro cíl platforma1...platformaN."
msgid "do not execute any stages"
msgstr "nespouštět žádné etapy"
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr " --timecheck <sec> "
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "nastavit časovou kontrolu na <sec> sekund (0 ji deaktivuje)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <zdroj_balíček> "
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -782,63 +779,63 @@ msgstr ""
"instalovat zdrojový balíček, sestavit binární balíček, odstranit spec "
"soubor, zdrojové kódy, záplaty a ikony."
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr " --recompile <zdroj_balíček> "
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "jako --rebuild, ale nesestavovat balíčky"
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr " --resign <balíček>+ "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "podepsat balíček (zahodit aktuální podpis)"
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr " --addsign <balíček>+ "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "přidat do balíčku podpis"
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr " --checksig <balíček>+"
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr " --K <balíček>+ "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "ověřit podpis v balíčku"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "vynechat případné PGP podpisy"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr "vynechat případné GPG podpisy"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "vynechat případné MD5 součty"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "zajistit, aby existovala platná databáze"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "znovu vytvořit databázi z existující databáze"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -846,7 +843,7 @@ msgstr ""
"nastavit oprávnění k souborům podle údajů v databázi balíčků pomocí stejných "
"voleb pro specifikaci balíčku, jako pro -q"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -854,146 +851,146 @@ msgstr ""
"nastavit vlastníka a skupinu vlastnící soubor podle údajů v databázi balíčků "
"pomocí stejných voleb pro specifikaci balíčku, jako pro -q"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "specifikovat lze jen jeden hlavní režim"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u a --uninstall jsou zastaralé a již je nelze použít.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Použijte volbu -e nebo --erase.\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "přemístění musejí začínat znakem /"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "přemístění musejí obsahovat ="
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "přemístění musejí mít za znakem = znak /"
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr "vynechané cesty musí začínat znakem /"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Interní chyba při zpracování parametrů (%d) :-(\n"
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "najednou lze provést jen jeden typ dotazu či ověření"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr "neočekávaný příznak pro dotaz"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr "neočekávaný formát dotazu"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "neočekávaný zdroj dotazu"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"vynucena může být jen instalace, aktualizace, smazání zdrojových kódů a spec "
"souboru"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "soubory mohou být přemístěny jen při instalaci balíčků"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "použít lze jen jeden z parametrů --prefix nebo --relocate"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate a --excludepath je možno použít jen při instalaci nových balíčků"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix je možno použít jen při instalaci nových balíčků"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "parametry pro --prefix musejí začínat znakem /"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) může být použit jen při instalaci balíčků"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent může být použit jen při instalaci balíčků"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles může být použit jen při instalaci balíčků"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs může být použit jen při instalaci balíčků"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs může být použit jen při instalaci balíčků"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs může být použit jen při instalaci balíčků"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "použít lze jen jeden z parametrů --excludedocs a --includedocs"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch může být použit jen při instalaci balíčků"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos může být použit jen při instalaci balíčků"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize může být použit jen při instalaci balíčků"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches může být použit jen při instalaci balíčků"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles může být použit jen při instalaci balíčků"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb může být použit jen při instalaci a odstraňování balíčků"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
@@ -1002,19 +999,19 @@ msgstr ""
"--noscripts může být použit jen při instalaci, odstraňování nebo kontrole "
"balíčků"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--allfiles může být použit jen při instalaci balíčků"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "----notriggers může být použito jen při instalaci nebo mazání balíčků"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -1022,13 +1019,13 @@ msgstr ""
"--nodeps může být použit jen při sestavování, rekompilaci, instalaci, "
"odstraňování a kontrole"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test může být použit jen při instalaci, odstraňování a sestavování"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1036,97 +1033,97 @@ msgstr ""
"--root (-r) může být použit jen při instalaci, odstraňování, dotazech nebo "
"znovuvytvoření databáze"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametry pro --root (-r) musejí začínat znakem /"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage lze použít jen při aktualizacích"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp lze použít jen při kontrole podpisů"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg lze použít jen při kontrole podpisů"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nomd5 může být použit jen při kontrole podpisů a ověřování balíčků"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr "žádné soubory k podepsání\n"
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr "přístup k souboru %s se nezdařil\n"
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr "pgp nenalezeno: "
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr "Vložte heslovou frázi: "
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "Chybná heslová fráze\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "Heslová fráze je v pořádku.\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Špatná %%_signature spec v souboru maker.\n"
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign může být použit jen při sestavování balíčků"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr "spuštění selhalo\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "neočekávané parametry pro --querytags "
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "ke kontrole podpisu nezadány žádné balíčky"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "k podepsání nezadány žádné balíčky"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "nezadány žádné balíčky pro odstranění"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "nezadány žádné balíčky pro instalaci"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "k dotazu na všechny balíčky zadány parametry navíc"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "k dotazu nezadány žádné parametry"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr "pro kontrolu všech balíčků zadány parametry navíc"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "pro kontrolu nezadány žádné balíčky"
@@ -1535,6 +1532,11 @@ msgstr " -U <balíček> "
msgid " --erase <package>"
msgstr " --erase <balíček>"
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " -K <balíček>+ "
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr " --resign <balíček>+ "
@@ -1943,7 +1945,7 @@ msgstr "Generuji podpis: %d\n"
msgid "Could not open %s: %s\n"
msgstr "Nemohu otevřít %s: %s\n"
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Nemohu zapsat balíček: %s"
@@ -1973,7 +1975,7 @@ msgstr "Nemohu přečíst ikonu %s: %s"
msgid "Unable to write payload to %s: %s\n"
msgstr "Nemohu zapsat balíček %s: %s"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapsáno: %s\n"
@@ -2421,11 +2423,11 @@ msgstr "otevírám db soubor %s mode 0x%x\n"
msgid "cannot get %s lock on database\n"
msgstr "nemohu zamknout databázi %s"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr "výhradní"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr "sdílený"
@@ -2454,12 +2456,12 @@ msgstr "uzavřen db index %s/%s\n"
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "otevírám db index %s/%s %s mode=0x%x\n"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "nemohu zamknout databázi zámkem %s v %s/%s\n"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr "uzamčen db index %s/%s\n"
@@ -2485,7 +2487,7 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr "%s má příliš velkou nebo moc malou celočíselnou hodnotu, přeskočeno\n"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2494,97 +2496,107 @@ msgstr ""
"Závislost \"B\" potřebuje období (předpokládáno stejné jako \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+#, fuzzy
+msgid "NO "
+msgstr "NENÍ OK"
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr "%s: %-45s ANO (přidány soubory)\n"
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr "%s: %-45s ANO (přidáno poskytuje)\n"
-#: lib/depends.c:1073
-#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+#: lib/depends.c:1071
+#, fuzzy, c-format
+msgid "%s: %-45s %-s (cached)\n"
msgstr "%s: %-45s %-3s (kešováno)\n"
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr "%s: %-45s ANO (db soubory)\n"
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr "%s: %-45s ANO (db poskytuje)\n"
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, fuzzy, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr "%s: %-45s ANO (db soubory)\n"
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr "%s: %-45s NE\n"
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) přidáno do keše závislostí.\n"
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "balíček %s koliduje: %s\n"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, fuzzy, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr "odstraňuji \"%s\" z indexu %s.\n"
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2602,8 +2614,8 @@ msgstr ""
"Pokud tento příkaz nevyřeší problém, naleznete více informací\n"
"na http://www.rpm.org nebo v diskuzním listu rpm-list@redhat.com.\n"
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr "(není číslo)"
@@ -2645,32 +2657,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "řádek %d: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "varování: %s uloženo jako %s"
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "nemohu odstranit %s - adresář není prázdný"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "rmdir %s selhalo: %s"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "otevření %s selhalo: %s\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "varování: %s vytvořeno jako %s"
@@ -2681,92 +2693,92 @@ msgstr "varování: %s vytvořeno jako %s"
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "Počet RPM_STRING_TYPE pro grabData() musí být 1.\n"
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr "Datový typ %d není podporován\n"
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "Chybný počet pro headerAddEntry(): %d\n"
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr "chybí { po %"
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr "po %{ chybí }"
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr "prázdný formát značky"
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr "prázdné jméno značky"
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr "neznámá značka"
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr "na konci pole očekáváno ]"
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr "neočekávaná ]"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr "neočekávaná }"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr "ve výrazu očekáván ?"
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr "ve výrazu je po ? očekávána {"
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr "ve výrazu je očekávána }"
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr "v podvýrazu je po ? očekávána :"
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr "ve výrazu je po : očekávána {"
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr "na konci výrazu je očekáváno |"
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr "(neznámý typ)"
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "chyba při vytváření dočasného souboru %s"
@@ -2776,7 +2788,7 @@ msgstr "chyba při vytváření dočasného souboru %s"
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "práce s balíčky verze 1 není podporována touto verzí RPM"
-#: lib/package.c:179
+#: lib/package.c:181
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
@@ -3017,244 +3029,243 @@ msgstr " je nutné pro %s-%s-%s\n"
msgid " conflicts with %s-%s-%s\n"
msgstr " koliduje s %s-%s-%s\n"
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "balíček %s-%s-%s je pro jinou architekturu"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "balíček %s-%s-%s je pro jiný operační systém"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "balíček %s-%s-%s je již nainstalován"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "balíček %s není přemístitelný\n"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, fuzzy, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr "soubor %s způsobuje konflikt mezi instalovaným %s-%s-%s a %s-%s-%s"
-#: lib/problems.c:121
+#: lib/problems.c:140
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr "soubor %s z instalace %s-%s-%s koliduje se souborem z balíčku %s-%s-%s"
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "balíček %s-%s-%s (který je novější, než %s-%s-%s) je již nainstalován"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, fuzzy, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "instalace balíčku %s-%s-%s potřebuje %ld%cb na systému souborů %s"
-#: lib/problems.c:141
+#: lib/problems.c:160
#, fuzzy, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "instalace balíčku %s-%s-%s potřebuje %ld%cb na systému souborů %s"
-#: lib/problems.c:146
+#: lib/problems.c:165
#, fuzzy, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "v balíčku %s-%s-%s předtransakční syscall(s): %s selhalo: %s"
-#: lib/problems.c:153
+#: lib/problems.c:172
#, fuzzy, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "neznámá chyba %d vznikla při manipulaci s balíčkem %s-%s-%s"
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "nemohu vytvořit %s: %s\n"
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "nemohu zapsat do %s"
-#: lib/psm.c:604
+#: lib/psm.c:605
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "očekávám balíček se zdrojovými kódy, nalezen však binární"
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "zdrojový balíček neobsahuje spec soubor"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "provedení %s-%s-%s skriptu selhalo, návratový kód: %d"
-#: lib/psm.c:961
+#: lib/psm.c:962
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "provedení %s-%s-%s skriptu selhalo, návratový kód: %d"
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "balíček: %s-%s-%s test souborů = %d\n"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, fuzzy, c-format
msgid "user %s does not exist - using root\n"
msgstr "uživatel %s neexistuje - použit uživatel root"
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "skupina %s neexistuje - použita skupina root"
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozbalování archívu selhalo %s%s: %s"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr " na souboru "
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "spouštím případný postinstalační skript\n"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "chyba ve formátu: %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr "(neobsahuje žádné soubory)"
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr "normální "
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr "nahrazen "
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr "neinstalován "
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr "sdílen v síti "
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr "(neznámý %3d) "
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr "(chybí stav) "
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "balíček nemá vlastníka souboru ani seznamy id"
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr "nemohu provést dotaz %s: %s\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otevření %s selhalo: %s\n"
-#: lib/query.c:576
-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:585 lib/rpminstall.c:320
-#, 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"
-
-#: lib/query.c:590
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr "dotaz na %s se nezdařil\n"
-#: lib/query.c:624
+#: lib/query.c:531
+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:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: Fread selhalo: %s\n"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n"
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr "žádné balíčky\n"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s neobsahuje žádné balíčky\n"
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr "žádný balíček neaktivuje %s\n"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr "žádný balíček nevyžaduje %s\n"
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr "žádný balíček neposkytuje %s\n"
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr "soubor %s: %s\n"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "soubor %s nevlastní žádný balíček\n"
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "neplatné číslo balíčku: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr "záznam balíčku číslo: %u\n"
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr "záznam %d nelze přečíst\n"
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr "balíček %s není nainstalován\n"
@@ -3495,118 +3506,95 @@ msgstr "mažu adresář %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "nemohu odstranit adresář %s: %s\n"
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "nezadány žádné balíčky pro instalaci"
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr "počítám balíčky pro instalaci\n"
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr "nalezeno %d balíčků\n"
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr "hledám balíčky pro stažení\n"
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "přeskakuji %s - rpmGlob selhal(%d)\n"
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr "Stahuji %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr " ... jako %s\n"
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "přeskakuji %s - přenos selhal - %s\n"
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr "přijato %d balíčků\n"
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "nemohu otevřít soubor %s: %s\n"
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr "%s nemůže být nainstalován\n"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nemohu otevřít databázi balíčků v %s\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr "balíček %s není přemístitelný\n"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr "chyba při čtení ze souboru %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, 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:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr "%s nemůže být nainstalován\n"
+
+#: lib/rpminstall.c:472
#, 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:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "nevyřešené závislosti:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr "instaluji binární balíčky\n"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "nemohu otevřít soubor %s: %s\n"
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "chyba: nemohu otevřít %s/packages.rpm\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" určuje více balíčků\n"
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "odstranění těchto balíčků by porušilo závislosti:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nemohu otevřít %s: %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "Instaluji %s\n"
@@ -3842,50 +3830,50 @@ msgstr "Musíte nastavit \"%%_gpg_name\" ve svém makro souboru"
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Musíte nastavit \"%%_pgp_name\" ve svém makro souboru"
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "OS je vyřazen: %s"
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "přemísťuji %s do %s\n"
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "vynechávám soubor %s%s\n"
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "vynechávám soubor %s%s\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr "přemísťuji %s do %s\n"
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "přemísťuji adresář %s do %s\n"
-#: lib/transaction.c:617
-#, c-format
-msgid "excluding directory %s\n"
-msgstr "vynechávám adresář %s\n"
-
-#: lib/transaction.c:741
+#: lib/transaction.c:771
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s přeskočeno, protože chybí příznak\n"
+#: lib/transaction.c:1359
+#, c-format
+msgid "excluding directory %s\n"
+msgstr "vynechávám adresář %s\n"
+
#: lib/verify.c:61
msgid "don't verify files in package"
msgstr "nekontrolovat soubory v balíčku"
@@ -3895,25 +3883,25 @@ msgstr "nekontrolovat soubory v balíčku"
msgid "do not execute %verifyscript (if any)"
msgstr "nespouštět žádné etapy"
-#: lib/verify.c:253
+#: lib/verify.c:257
#, fuzzy
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
"balíček neobsahuje ani uživatelská jména ani seznam id (nemělo by se nikdy "
"stát)"
-#: lib/verify.c:271
+#: lib/verify.c:275
#, fuzzy
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
"balíček neobsahuje ani jména skupin ani seznam id (nemělo by se nikdy stát)"
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "chybí %s\n"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Nevyřešené závislosti pro %s-%s-%s: "
@@ -4129,6 +4117,30 @@ msgstr "url port musí být číslo\n"
msgid "failed to create %s: %s\n"
msgstr "nemohu vytvořit %s: %s\n"
+#~ msgid " --timecheck <secs> "
+#~ msgstr " --timecheck <sec> "
+
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "nastavit časovou kontrolu na <sec> sekund (0 ji deaktivuje)"
+
+#~ msgid "%s does not appear to be a RPM package\n"
+#~ msgstr "nezdá se, že by %s byl balíček typu RPM\n"
+
+#~ msgid "counting packages to install\n"
+#~ msgstr "počítám balíčky pro instalaci\n"
+
+#~ msgid "found %d packages\n"
+#~ msgstr "nalezeno %d balíčků\n"
+
+#~ msgid "looking for packages to download\n"
+#~ msgstr "hledám balíčky pro stažení\n"
+
+#~ msgid "skipping %s - rpmGlob failed(%d)\n"
+#~ msgstr "přeskakuji %s - rpmGlob selhal(%d)\n"
+
+#~ msgid "retrieved %d packages\n"
+#~ msgstr "přijato %d balíčků\n"
+
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
diff --git a/po/da.po b/po/da.po
index 1be71975d..26628a99f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\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"
@@ -390,11 +390,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr " --dbpath <kat> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -410,7 +410,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -661,6 +661,11 @@ msgstr ""
msgid " --erase <package>"
msgstr " --erase <pakke>"
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " -K <pakke>+ "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "slet (afinstallér) pakke"
@@ -752,354 +757,346 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr " --timecheck <sek> "
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr " --resign <pakke>+ "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr " --addsign <pakke>+ "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "tilfřj signatur til pakke"
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr " --checksig <pakke>+"
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr " -K <pakke>+ "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "verificér pakke signatur"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--nopgp mĺ kun bruges under signaturkontrollering"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage mĺ kun bruges under opgraderinger"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp mĺ kun bruges under signaturkontrollering"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg mĺ kun bruges under signaturkontrollering"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr "pgp ikke fundet: "
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1491,6 +1488,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " -K <pakke>+ "
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1880,7 +1882,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Kan ikke ĺbne spec-fil %s: %s\n"
@@ -1910,7 +1912,7 @@ msgstr "Kan ikke ĺbne spec-fil %s: %s\n"
msgid "Unable to write payload to %s: %s\n"
msgstr "Kan ikke ĺbne spec-fil %s: %s\n"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2330,11 +2332,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr "Kan ikke ĺbne %s/packages.rpm\n"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2363,12 +2365,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2394,104 +2396,114 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+#, fuzzy
+msgid "NO "
+msgstr "IKKE OK"
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2505,8 +2517,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2548,32 +2560,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "%6d %s\n"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr " ... som %s\n"
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "fjernelse af %s fejlede: %s"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "fjernelse af %s fejlede: %s"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "fjernelse af %s fejlede: %s"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2583,92 +2595,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "opretter kataloget %s\n"
@@ -2677,7 +2689,7 @@ msgstr "opretter kataloget %s\n"
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2899,241 +2911,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "kan ikke ĺbne %s: %s\n"
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "kan ikke ĺbne %s: %s\n"
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-
-#: lib/query.c:585 lib/rpminstall.c:320
+#: lib/query.c:525
#, c-format
-msgid "%s does not appear to be a RPM package\n"
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:590
-#, c-format
-msgid "query of %s failed\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "fjernelse af %s fejlede: %s"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr "ingen pakker\n"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "ugyldig pakkenummer: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3369,117 +3380,94 @@ msgstr "fjener kataloget %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr "fundet %d pakke(r)\n"
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr "leder efter pakker til at hente\n"
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr "Modtager %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr "modtager %d pakker\n"
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "kan ikke ĺbne fil %s: %s\n"
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "Kan ikke ĺbne %s/packages.rpm\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr "installerer binćre pakker\n"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "kan ikke ĺbne fil %s: %s\n"
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "Kan ikke ĺbne %s/packages.rpm\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke ĺbne %s: %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
@@ -3704,48 +3692,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3756,20 +3744,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
@@ -3975,6 +3963,18 @@ msgstr ""
msgid "failed to create %s: %s\n"
msgstr ""
+#~ msgid " --timecheck <secs> "
+#~ msgstr " --timecheck <sek> "
+
+#~ msgid "found %d packages\n"
+#~ msgstr "fundet %d pakke(r)\n"
+
+#~ msgid "looking for packages to download\n"
+#~ msgstr "leder efter pakker til at hente\n"
+
+#~ msgid "retrieved %d packages\n"
+#~ msgstr "modtager %d pakker\n"
+
#~ msgid " %s {--initdb} [--dbpath <dir>]\n"
#~ msgstr " %s {--initdb} [--dbpath <katalog>]\n"
diff --git a/po/de.po b/po/de.po
index b72d27e90..d24dbb04d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: 1998-08-03 18:02+02:00\n"
"Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
"Language-Team: German <de@li.org>\n"
@@ -456,12 +456,12 @@ msgstr "Portnummer des ftp-Servers (oder -Proxys)"
msgid "query mode"
msgstr "Anfrage-Modus"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "<VERZ> als Datenbankverzeichnis benutzen"
@@ -478,7 +478,7 @@ msgstr "S als Kopfzeilen-Format benutzen (impliziert -i)"
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "<VERZ> als Stammverzeichnis benutzen"
@@ -750,6 +750,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " -b<STUFE> <SPEC> "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "Paket löschen (deinstallieren)"
@@ -852,21 +857,11 @@ msgstr ""
msgid "do not execute any stages"
msgstr "Keine Stufen ausführen"
-#: rpm.c:534
-#, fuzzy
-msgid " --timecheck <secs> "
-msgstr " -b<STUFE> <SPEC> "
-
#: rpm.c:535
-#, fuzzy
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "Die Zeitüberprüfung auf S Sekunden setzen (mit 0 ausschalten)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -874,69 +869,69 @@ msgstr ""
"Quellpaket installieren, Binarypaket erstellen und spec-Datei, Quellen, "
"Patch-Dateien und Icons löschen"
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "wie --rebuild aber kein Paket erstellen"
-#: rpm.c:543
+#: rpm.c:541
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
-#: rpm.c:545
+#: rpm.c:543
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "Signatur einem Paket hinzufügen"
-#: rpm.c:547
+#: rpm.c:545
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:548
+#: rpm.c:546
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "Paketsignatur überprüfen"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "alle PGP-Signaturen überspringen"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
#, fuzzy
msgid "skip any GPG signatures"
msgstr "alle PGP-Signaturen überspringen"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "alle MD5-Signaturen überspringen"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "Sicherstellen, daß eine gültige Datenbank vorhanden ist"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "Datenbank aus der vorhandenen neu erstellen"
# Was ist gemeint?
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -945,7 +940,7 @@ msgstr ""
"Paketspezifikationsoptionen wie bei -q benutzt würden"
# Was ist gemeint?
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -953,154 +948,154 @@ msgstr ""
"Datei-Eigentümer und -Gruppe gemäß deren in der Paketdatenbank setzen, wie "
"wenn dieselben Paketspezifikationsoptionen wie bei -q benutzt würden"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "Es darf nur ein Hauptmodus angegeben werden"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u und --uninstall sind veraltet und funktionieren nicht mehr.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Benutzen Sie stattdessen -e oder --erase\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "Verschiebungen müssen ein ť=Ť beinhalten"
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "bei Verschiebungen muss ein ť/Ť dem ť=Ť folgen"
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
"Nur nur eine Art der Anfrage/Überprüfung kann pro Programmlauf durchgeführt "
"werden"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
#, fuzzy
msgid "unexpected query flags"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
#, fuzzy
msgid "unexpected query format"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "nur die Installation und Aktualisierung darf erzwungen werden"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "Dateien können nur während der Paketinstallation verschoben werden"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "nur eines der Argumente --prefix oder --relocate darf angegeben werden"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate darf nur bei der Installation neuer Pakete benutzt werden"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "Argumente zu --prefix müssen mit einem / beginnen"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"nur eines der Argumente --excludedocs und --includedocs darf angegeben werden"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches darf nur während der Paketdeinstallaiton angegeben werden"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb kann nur während der Paketinstallation und -deinstallation "
"angegeben werden"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
@@ -1109,12 +1104,12 @@ msgstr ""
"--noscripts darf nur während der Paketinstallation, -deinstallation und "
"-überprüfung angegeben werden"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--allfiles darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -1123,7 +1118,7 @@ msgstr ""
"--justdb kann nur während der Paketinstallation und -deinstallation "
"angegeben werden"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1132,7 +1127,7 @@ msgstr ""
"--nodeps darf nur während der Paketinstallation, -deinstallation und "
"-überprüfung angegeben werden"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -1140,7 +1135,7 @@ msgstr ""
"--test darf nur während der Paketinstallation, -deinstallation und "
"-erstellung angegeben werden"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1148,103 +1143,103 @@ msgstr ""
"--root (-r) darf nur während der Paketinstallation, -deinstallation, "
"-anfrage und Datenbankneuerstellungen angegeben werden"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "Argumente zu --root (-r) müssen mit einem / beginnen"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage darf nur während Aktualisierungen benutzt werden"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp darf nur während der Signatur-Überprüfung benutzt werden"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nopgp darf nur während der Signatur-Überprüfung benutzt werden"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
"--nopgp darf nur während der Signatur- und Paketüberprüfung angegeben werden"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
#, fuzzy
msgid "pgp not found: "
msgstr "Datei auf dem Server nicht gefunden"
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "Die Passwortüberprüfung ist fehlgeschlagen\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "Das Passwort ist richtig.\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign darf nur während der Paketerstellung benutzt werden"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "Unerwartete Argumente zu --querytags "
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "Es wurden keine Pakete für die Signaturüberprüfung angegeben"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "Es wurden keine Pakete für die Signatur angeben"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
@@ -1689,6 +1684,11 @@ msgstr " -b<STUFE> <SPEC> "
msgid " --erase <package>"
msgstr "Paket installieren"
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " -b<STUFE> <SPEC> "
+
#: rpmqv.c:660
#, fuzzy
msgid " --resign <pkg>+ "
@@ -2111,7 +2111,7 @@ msgid "Could not open %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen\n"
# , c-format
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Nicht möglich %s zu schreiben"
@@ -2146,7 +2146,7 @@ msgstr "Nicht möglich %s zu schreiben"
msgid "Unable to write payload to %s: %s\n"
msgstr "Nicht möglich %s zu schreiben"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2604,11 +2604,11 @@ msgstr "Datenbank aus der vorhandenen neu erstellen"
msgid "cannot get %s lock on database\n"
msgstr "kann %s lock für die Datenbank nicht bekommen"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr "exklusiv"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr "geteilt"
@@ -2637,12 +2637,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, fuzzy, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "kann %s lock für die Datenbank nicht bekommen"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2668,105 +2668,114 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
-#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
-msgstr ""
+#: lib/depends.c:1071
+#, fuzzy, c-format
+msgid "%s: %-45s %-s (cached)\n"
+msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, fuzzy, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, fuzzy, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, fuzzy, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, fuzzy, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "Paket %s wird nicht in %s aufgeführt"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "Paket %s wird nicht in %s aufgeführt"
# FIXME
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, fuzzy, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2780,8 +2789,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr "(keine Zahl)"
@@ -2827,32 +2836,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "kann %s nicht entfernen - Verzeichnis ist nicht leer"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "Entfernen von %s fehlgeschlagen: %s"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "öffnen von %s fehlgeschlagen: %s\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "kann Datei %s nicht öffnen: "
@@ -2862,95 +2871,95 @@ msgstr "kann Datei %s nicht öffnen: "
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr "fehlende { nach %{"
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr "fehlende } nach %{"
# ťTagŤ übersetzen??? -ke-
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr "leeres ťTagŤ-Format"
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr "leerer ťTagŤ-Name"
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr "unbekannter ťTagŤ"
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr "] am Ende des Arrays erwartet"
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr "unerwartete ]"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr "unerwartete }"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr "? im Ausdruck erwartet"
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
#, fuzzy
msgid "{ expected after ? in expression"
msgstr "{ nach ? im Ausdruck erwartet"
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr "} im Ausdruck erwartet"
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ": nach ? Unterausdruck erwartet"
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
#, fuzzy
msgid "{ expected after : in expression"
msgstr "{ nach : im Ausdruck erwartet"
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr "| am Ende des Ausdrucks erwartet"
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr "(unbekannter Typ)"
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
@@ -2961,7 +2970,7 @@ msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
-#: lib/package.c:179
+#: lib/package.c:181
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
@@ -3217,251 +3226,250 @@ msgid " conflicts with %s-%s-%s\n"
msgstr " steht im Konflikt mit %s-%s-%s\n"
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr " steht im Konflikt mit %s-%s-%s\n"
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:146
+#: lib/problems.c:165
#, fuzzy, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "Ausführung des Skripts fehlgeschlagen"
-#: lib/psm.c:961
+#: lib/psm.c:962
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "Ausführung des Skripts fehlgeschlagen"
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "öffnen von %s fehlgeschlagen: %s\n"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "Keine Stufen ausführen"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "Fehler beim Format %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr "(beinhaltet keine Dateien)"
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
#, fuzzy
msgid "not installed "
msgstr "Paket %s ist nicht installiert\n"
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, fuzzy, c-format
msgid "(unknown %3d) "
msgstr "(unbekannter Typ)"
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "Paket hat keinen Namen"
-#: lib/query.c:438
+#: lib/query.c:392
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "öffnen von %s fehlgeschlagen: %s\n"
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
-
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
-msgstr "%s scheint kein RPM-Paket zu sein\n"
-
-#: lib/query.c:590
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr "Anfrage von %s fehlgeschlagen\n"
-#: lib/query.c:624
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
+msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
+
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
+
+#: lib/query.c:599
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "Anfrage von %s fehlgeschlagen\n"
-#: lib/query.c:647
+#: lib/query.c:622
#, fuzzy
msgid "no packages\n"
msgstr "Anfrage an alle Pakete"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr "kein Paket triggert %s\n"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr "kein Paket verlangt %s\n"
# oder besser: ... listet %s auf? -ke-
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr "kein Paket stellt %s bereit\n"
# , c-format
-#: lib/query.c:720
+#: lib/query.c:695
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "ungültige Paket-Nummer: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "ungültige Paket-Nummer: %s\n"
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr "Eintrag %d konnte nicht gelesen werden\n"
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr "Paket %s ist nicht installiert\n"
@@ -3706,123 +3714,98 @@ 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:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: lib/rpminstall.c:210
-#, fuzzy
-msgid "counting packages to install\n"
-msgstr "Es wurden keine Pakete für die Installation angegeben"
-
-#: lib/rpminstall.c:214
-#, fuzzy, c-format
-msgid "found %d packages\n"
-msgstr "Anfrage an alle Pakete"
-
-#: lib/rpminstall.c:219
-#, fuzzy
-msgid "looking for packages to download\n"
-msgstr "Fehler beim Suchen nach Paket %s\n"
-
-#: lib/rpminstall.c:234
-#, fuzzy, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
-
# , c-format
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, 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:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, fuzzy, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "kann Datei %s nicht öffnen: "
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, fuzzy, c-format
-msgid "%s cannot be installed\n"
-msgstr "Fehler: %s kann nicht installiert werden\n"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, fuzzy, c-format
+msgid "%s cannot be installed\n"
+msgstr "Fehler: %s kann nicht installiert werden\n"
+
+#: lib/rpminstall.c:472
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
#, fuzzy
msgid "installing binary packages\n"
msgstr "Paket installieren"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, fuzzy, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "kann Datei %s nicht öffnen: "
+
+#: lib/rpminstall.c:580
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" bezeichnet mehrere Pakete\n"
# oder besser: "... verletzen" ?
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "Installiere %s\n"
@@ -4064,53 +4047,53 @@ msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
# , c-format
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "Hole %s heraus\n"
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "kann Datei %s nicht öffnen: "
# , c-format
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "Hole %s heraus\n"
# , c-format
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "Hole %s heraus\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/transaction.c:617
-#, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-
-#: lib/transaction.c:741
+#: lib/transaction.c:771
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
+#: lib/transaction.c:1359
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
+
#: lib/verify.c:61
#, fuzzy
msgid "don't verify files in package"
@@ -4121,20 +4104,20 @@ msgstr "Paket installieren"
msgid "do not execute %verifyscript (if any)"
msgstr "Keine Stufen ausführen"
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "fehlende { nach %{"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
@@ -4351,6 +4334,33 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
msgid "failed to create %s: %s\n"
msgstr "anlegen von %s fehlgeschlagen\n"
+#, fuzzy
+#~ msgid " --timecheck <secs> "
+#~ msgstr " -b<STUFE> <SPEC> "
+
+#, fuzzy
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "Die Zeitüberprüfung auf S Sekunden setzen (mit 0 ausschalten)"
+
+#~ msgid "%s does not appear to be a RPM package\n"
+#~ msgstr "%s scheint kein RPM-Paket zu sein\n"
+
+#, fuzzy
+#~ msgid "counting packages to install\n"
+#~ msgstr "Es wurden keine Pakete für die Installation angegeben"
+
+#, fuzzy
+#~ msgid "found %d packages\n"
+#~ msgstr "Anfrage an alle Pakete"
+
+#, fuzzy
+#~ msgid "looking for packages to download\n"
+#~ msgstr "Fehler beim Suchen nach Paket %s\n"
+
+#, fuzzy
+#~ msgid "skipping %s - rpmGlob failed(%d)\n"
+#~ msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
+
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
@@ -4635,10 +4645,6 @@ msgstr "anlegen von %s fehlgeschlagen\n"
#~ " rpm {--recompile} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
#, fuzzy
-#~ msgid " -K <pkg>+ "
-#~ msgstr " -b<STUFE> <SPEC> "
-
-#, fuzzy
#~ msgid "line %d: Version not permitted: %s"
#~ msgstr "Paket %s wird nicht in %s aufgeführt"
diff --git a/po/es.po b/po/es.po
index 7d139b2ee..0dc8b948b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -646,6 +646,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -737,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1467,6 +1463,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2303,11 +2303,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2336,12 +2336,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2367,104 +2367,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2478,8 +2487,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2521,32 +2530,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2556,92 +2565,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2650,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2869,241 +2878,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3339,117 +3347,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3672,48 +3657,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3724,20 +3709,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 0045c63a8..c385d9a4c 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -646,6 +646,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -737,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1467,6 +1463,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2303,11 +2303,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2336,12 +2336,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2367,104 +2367,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2478,8 +2487,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2521,32 +2530,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2556,92 +2565,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2650,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2869,241 +2878,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3339,117 +3347,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3672,48 +3657,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3724,20 +3709,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index acced07b9..1b266835c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -417,12 +417,12 @@ msgstr "ftp-palvelijan (tai proxyn) porttinumero"
msgid "query mode"
msgstr "kyselymoodi"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "kaytä <hakem> tietokannan hakemistona"
@@ -439,7 +439,7 @@ msgstr "käytä s headerin formaatina (josta seuraa -i)"
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "käytä <hakem> ylimpänä hakemistona"
@@ -709,6 +709,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " -b<vaihe> <määrittely> "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "poista paketti"
@@ -807,21 +812,11 @@ msgstr ""
msgid "do not execute any stages"
msgstr "älä suorita mitään vaiheita"
-#: rpm.c:534
-#, fuzzy
-msgid " --timecheck <secs> "
-msgstr " -b<vaihe> <määrittely> "
-
#: rpm.c:535
-#, fuzzy
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "aseta aikatarkistus S sekunniksi (0 ohittaa)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -829,68 +824,68 @@ msgstr ""
"asenna lähdekoodipaketti, käännä binääripaketti ja poista "
"määrittelytiedosto, lähdekoodi, korjaukset ja kuvakkeet"
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "kuten --rebuild, mutta ei käännä paketteja"
-#: rpm.c:543
+#: rpm.c:541
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
-#: rpm.c:545
+#: rpm.c:543
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "lisää allekirjoitus pakettiin"
-#: rpm.c:547
+#: rpm.c:545
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:548
+#: rpm.c:546
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "tarkista paketin allekirjoitus"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "ohita PGP-allekirjoitukset"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
#, fuzzy
msgid "skip any GPG signatures"
msgstr "ohita PGP-allekirjoitukset"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "ohita MD5-allekirjoitukset"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "tarkista, että kunnollinen tietokanta löytyy"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -898,7 +893,7 @@ msgstr ""
"aseta tiedostojen oikeudet niiksi, jotka ne ovat pakettien tietokannassa "
"käyttäen samoja pakettien määrittelyparametrejä kuin -q"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -906,150 +901,150 @@ msgstr ""
"aseta tiedostojen omistaja ja ryhmä niiksi, jotka ne ovat pakettien "
"tietokannassa käyttäen samoja pakettien määrittelyparametrejä kuin -q"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "vain yksi päämoodi voidaan määritellä"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u ja --uninstall ovat vanhentuneet eivätkä enää toimi.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Käytä sen sijaan -e tai --erase .\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "siirtojen pitää alkaa /-merkillä"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "siirroissa pitää olla =-merkki"
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "siirroissa pitää olla / =-merkin jälkeen"
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "siirtojen pitää alkaa /-merkillä"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
#, fuzzy
msgid "unexpected query flags"
msgstr "odottamaton kyselyn lähde"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
#, fuzzy
msgid "unexpected query format"
msgstr "odottamaton kyselyn lähde"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "odottamaton kyselyn lähde"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "vain asennus tai päivitys voidaan pakottaa"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "vain toinen --prefix tai --relocate voidaan antaa"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate: voidaan käyttää vain uusia paketteja asennettaessa"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix parametrien pitää alkaa /-merkillä"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
@@ -1058,12 +1053,12 @@ msgstr ""
"--noscripts: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
"tarkistettaessa"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -1071,7 +1066,7 @@ msgid ""
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1080,7 +1075,7 @@ msgstr ""
"--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
"tarkistettaessa"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -1088,7 +1083,7 @@ msgstr ""
"--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
"käännettäessä"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1096,24 +1091,24 @@ msgstr ""
"--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
"kyseltäessä ja tietokannan uudelleenluonnissa"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametrit --root (-r):lle alettava /-merkillä"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage: voidaan käyttää vain paketteja päivitettäessä"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
@@ -1121,79 +1116,79 @@ msgstr ""
"--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa ja paketteja "
"todennettaessa"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
#, fuzzy
msgid "pgp not found: "
msgstr "Tiedostoa ei löytynyt palvelimelta"
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
#, fuzzy
msgid "exec failed\n"
msgstr "%s: avaus ei onnistunut\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "--querytags: odottamattomia parametrejä"
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "allekirjoituksen tarkistukselle ei määritelty paketteja"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "allekirjoitukselle ei määritelty paketteja"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "poistolle ei määritelty paketteja"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "asennukselle ei määritelty paketteja"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "kyselylle ei annettu parametrejä"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "tarkistukselle ei annettu parametrejä"
@@ -1638,6 +1633,11 @@ msgstr " -b<vaihe> <määrittely> "
msgid " --erase <package>"
msgstr "asenna paketti"
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " -b<vaihe> <määrittely> "
+
#: rpmqv.c:660
#, fuzzy
msgid " --resign <pkg>+ "
@@ -2039,7 +2039,7 @@ msgstr "generoi PGP-allekirjoitus"
msgid "Could not open %s: %s\n"
msgstr "%s:n avaus epäonnistui\n"
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
@@ -2069,7 +2069,7 @@ msgstr "%s:n kirjoitus ei onnistu"
msgid "Unable to write payload to %s: %s\n"
msgstr "%s:n kirjoitus ei onnistu"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2504,11 +2504,11 @@ msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
msgid "cannot get %s lock on database\n"
msgstr "en voi saada %s lukitusta tietokantaan"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr "poissulkevaa"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr "jaettua"
@@ -2537,12 +2537,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, fuzzy, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "en voi saada %s lukitusta tietokantaan"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2568,104 +2568,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
-#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
-msgstr ""
+#: lib/depends.c:1071
+#, fuzzy, c-format
+msgid "%s: %-45s %-s (cached)\n"
+msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, fuzzy, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, fuzzy, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, fuzzy, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, fuzzy, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "paketti %s ei ole %s:ssä"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "paketti %s ei ole %s:ssä"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, fuzzy, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2679,8 +2688,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr "(ei ole luku)"
@@ -2722,32 +2731,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "en voi poistaa %s -hakemisto ei ole tyhjä"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s:n rmdir epäonnistui: %s"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "en voinut avata tiedostoa %s: "
@@ -2757,94 +2766,94 @@ msgstr "en voinut avata tiedostoa %s: "
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr "puuttuva '{' '%':n jälkeen"
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr "puuttuva '{' '%{':n jälkeen"
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr "tyhjä nimiön formaatti"
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr "tyhjä nimiön nimi"
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr "tuntematon nimiö"
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr "']' puuttuu taulukkomäärittelyn lopusta"
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr "odottamaton ']'"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr "odottamaton '}'"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr "odotin '?'-merkkiä ilmauksessa"
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
#, fuzzy
msgid "{ expected after ? in expression"
msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa "
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr "odotin '}'-merkkiä ilmauksessa"
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa "
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
#, fuzzy
msgid "{ expected after : in expression"
msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa "
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr "odotin '}'-merkkiä ilmauksen lopussa"
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr "(tuntematon tyyppi)"
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
@@ -2855,7 +2864,7 @@ msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
-#: lib/package.c:179
+#: lib/package.c:181
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
@@ -3107,245 +3116,244 @@ msgstr "vaatii %s-%s-%s\n"
msgid " conflicts with %s-%s-%s\n"
msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, fuzzy, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "skriptin ajo epäonnistui"
-#: lib/psm.c:961
+#: lib/psm.c:962
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "skriptin ajo epäonnistui"
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "älä suorita mitään vaiheita"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "virhe formaatissa: %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr "(ei tiedostoja)"
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
#, fuzzy
msgid "not installed "
msgstr "paketti %s ei ole asennettu\n"
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, fuzzy, c-format
msgid "(unknown %3d) "
msgstr "(tuntematon tyyppi)"
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "paketilla ei ole nimeä"
-#: lib/query.c:438
+#: lib/query.c:392
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
-
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
-msgstr "%s ei vaikuta RPM-paketilta\n"
-
-#: lib/query.c:590
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr "%s:n kysely ei onnistunut\n"
-#: lib/query.c:624
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
+msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
+
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: readLead epäonnistui\n"
+
+#: lib/query.c:599
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "%s:n kysely ei onnistunut\n"
-#: lib/query.c:647
+#: lib/query.c:622
#, fuzzy
msgid "no packages\n"
msgstr "kysele kaikki paketit"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr "mikään paketti ei laukaise %s:a\n"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr "mikään pakettie ei tarvitse %s:a\n"
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr "mikään paketti ei tarjoa %s:a\n"
-#: lib/query.c:720
+#: lib/query.c:695
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "virheellinen paketin numero: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "virheellinen paketin numero: %s\n"
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr "tietuetta %d ei voitu lukea\n"
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
@@ -3584,121 +3592,96 @@ msgstr "virhe luotaessa hakemistoa %s: %s"
msgid "failed to remove directory %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "asennukselle ei määritelty paketteja"
-#: lib/rpminstall.c:210
-#, fuzzy
-msgid "counting packages to install\n"
-msgstr "asennukselle ei määritelty paketteja"
-
-#: lib/rpminstall.c:214
-#, fuzzy, c-format
-msgid "found %d packages\n"
-msgstr "kysele kaikki paketit"
-
-#: lib/rpminstall.c:219
-#, fuzzy
-msgid "looking for packages to download\n"
-msgstr "virhe etsittäessä pakettia %s\n"
-
-#: lib/rpminstall.c:234
-#, fuzzy, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr "Haen: %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, fuzzy, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "en voinut avata tiedostoa %s: "
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, fuzzy, c-format
-msgid "%s cannot be installed\n"
-msgstr "virhe: %s ei voida asentaa\n"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, fuzzy, c-format
+msgid "%s cannot be installed\n"
+msgstr "virhe: %s ei voida asentaa\n"
+
+#: lib/rpminstall.c:472
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "puuttuvat riippuvuudet:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
#, fuzzy
msgid "installing binary packages\n"
msgstr "asenna paketti"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, fuzzy, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "en voinut avata tiedostoa %s: "
+
+#: lib/rpminstall.c:580
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" määrittää useita paketteja\n"
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "Asennan: %s\n"
@@ -3937,50 +3920,50 @@ msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "Haen: %s\n"
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "Haen: %s\n"
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "Haen: %s\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/transaction.c:617
-#, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "virhe luotaessa hakemistoa %s: %s"
-
-#: lib/transaction.c:741
+#: lib/transaction.c:771
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
+#: lib/transaction.c:1359
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "virhe luotaessa hakemistoa %s: %s"
+
#: lib/verify.c:61
#, fuzzy
msgid "don't verify files in package"
@@ -3991,20 +3974,20 @@ msgstr "asenna paketti"
msgid "do not execute %verifyscript (if any)"
msgstr "älä suorita mitään vaiheita"
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "puuttuva '{' '%':n jälkeen"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
@@ -4220,6 +4203,33 @@ msgid "failed to create %s: %s\n"
msgstr "%s:n luonti epäonnistui\n"
#, fuzzy
+#~ msgid " --timecheck <secs> "
+#~ msgstr " -b<vaihe> <määrittely> "
+
+#, fuzzy
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "aseta aikatarkistus S sekunniksi (0 ohittaa)"
+
+#~ msgid "%s does not appear to be a RPM package\n"
+#~ msgstr "%s ei vaikuta RPM-paketilta\n"
+
+#, fuzzy
+#~ msgid "counting packages to install\n"
+#~ msgstr "asennukselle ei määritelty paketteja"
+
+#, fuzzy
+#~ msgid "found %d packages\n"
+#~ msgstr "kysele kaikki paketit"
+
+#, fuzzy
+#~ msgid "looking for packages to download\n"
+#~ msgstr "virhe etsittäessä pakettia %s\n"
+
+#, fuzzy
+#~ msgid "skipping %s - rpmGlob failed(%d)\n"
+#~ msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
+
+#, fuzzy
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
@@ -4516,10 +4526,6 @@ msgstr "%s:n luonti epäonnistui\n"
#~ "lähdekoodiN.rpm"
#, fuzzy
-#~ msgid " -K <pkg>+ "
-#~ msgstr " -b<vaihe> <määrittely> "
-
-#, fuzzy
#~ msgid "line %d: Version not permitted: %s"
#~ msgstr "paketti %s ei ole %s:ssä"
diff --git a/po/fr.po b/po/fr.po
index cad1a277d..594525e71 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
msgid ""
-msgstr "POT-Creation-Date: 2001-03-16 11:04-0500\n"
+msgstr "POT-Creation-Date: 2001-04-23 16:53-0400\n"
#: build.c:31
#, fuzzy, c-format
@@ -393,11 +393,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -413,7 +413,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
#, fuzzy
msgid "use <dir> as the top level directory"
msgstr " --root <dir>\t- utilise <dir> comme répertoire racine"
@@ -707,6 +707,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " --checksig <pkg>+ - vérifie la signature PGP"
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -811,23 +816,11 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-#, fuzzy
-msgid " --timecheck <secs> "
-msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-
#: rpm.c:535
-#, fuzzy
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-" --time-check <s> - positionne l'intervalle de vérification ŕ S "
-"secondes (0 le désactive)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
#, fuzzy
msgid ""
"install source package, build binary package and remove spec file, sources, "
@@ -836,249 +829,249 @@ msgstr ""
" et efface le fichier spec, les sources, les "
"patches, et les icones."
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpm.c:548
+#: rpm.c:546
#, fuzzy
msgid " -K <pkg>+ "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
#, fuzzy
msgid "skip any GPG signatures"
msgstr " --sign - genčre une signature PGP"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "un seul mode majeur peut ętre spécifié"
-#: rpm.c:732
+#: rpm.c:730
#, fuzzy
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u et --uninstall sont obsolčtes et seront bientôt supprimés.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Utilisez de préférence -e ou --erase.\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
#, fuzzy
msgid "relocations must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "un seul type de requęte/vérification peut ętre effectué ŕ la fois"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
#, fuzzy
msgid "unexpected query flags"
msgstr "source de requęte inattendue"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
#, fuzzy
msgid "unexpected query format"
msgstr "source de requęte inattendue"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "source de requęte inattendue"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "seules l'installation et la mise ŕ jour peuvent ętre forcées"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
#, fuzzy
msgid "files may only be relocated during package installation"
msgstr ""
"--replacefiles ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
#, fuzzy
msgid "only one of --prefix or --relocate may be used"
msgstr "un seul mode majeur peut ętre spécifié"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--clean ne peut ętre spécifié que lors de la construction d'un package"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
#, fuzzy
msgid "--prefix may only be used when installing new packages"
msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
#, fuzzy
msgid "arguments to --prefix must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
"--hash (-h) ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
"--percent ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
"--replacefiles ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
#, fuzzy
msgid "--excludedocs may only be specified during package installation"
msgstr ""
"--percent ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
#, fuzzy
msgid "--includedocs may only be specified during package installation"
msgstr ""
"--percent ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
#, fuzzy
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "un seul mode majeur peut ętre spécifié"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
#, fuzzy
msgid "--ignorearch may only be specified during package installation"
msgstr ""
"--percent ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
#, fuzzy
msgid "--ignoreos may only be specified during package installation"
msgstr ""
"--percent ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr ""
"--percent ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
#, fuzzy
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--replacepkgs ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
#, fuzzy
msgid "--allfiles may only be specified during package installation"
msgstr ""
"--replacefiles ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
#, fuzzy
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--test ne peut ętre spécifié que lors de l'installation ou désinstallation "
"d'un package"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
@@ -1087,13 +1080,13 @@ msgstr ""
"--test ne peut ętre spécifié que lors de l'installation ou désinstallation "
"d'un package"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr ""
"--replacefiles ne peut ętre spécifié que lors de l'installation d'un package"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -1102,7 +1095,7 @@ msgstr ""
"--test ne peut ętre spécifié que lors de l'installation ou désinstallation "
"d'un package"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1111,7 +1104,7 @@ msgstr ""
"--test ne peut ętre spécifié que lors de l'installation ou désinstallation "
"d'un package"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
#, fuzzy
msgid ""
"--test may only be specified during package installation, erasure, and "
@@ -1120,7 +1113,7 @@ msgstr ""
"--test ne peut ętre spécifié que lors de l'installation ou désinstallation "
"d'un package"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
#, fuzzy
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
@@ -1129,105 +1122,105 @@ msgstr ""
"--root (-r) ne peut ętre spécifié que lors de l'installation, de la "
"désinstallation ou de l'interrogation d'un package"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage ne peut ętre spécifié que lors de mises ŕ jour"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
#, fuzzy
msgid "--nopgp may only be used during signature checking"
msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
#, fuzzy
msgid "pgp not found: "
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "La vérification du mot de passe a échoué\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "Mot de passe correct.\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
#, fuzzy
msgid "exec failed\n"
msgstr "La construction a échoué.\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "aucun package n'a été spécifié pour la vérification de signature"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
#, fuzzy
msgid "no packages given for signing"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
#, fuzzy
msgid "extra arguments given for query of all packages"
msgstr "aucun argument n'a été fourni pour la requęte"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "aucun argument n'a été fourni pour la requęte"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "aucun argument n'a été fourni pour la requęte"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "aucun argument n'a été fourni pour la vérification"
@@ -1657,6 +1650,11 @@ msgid " --erase <package>"
msgstr ""
" -p <packagefile>+ - interroge le package (non installé) <packagefile>"
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " --checksig <pkg>+ - vérifie la signature PGP"
+
#: rpmqv.c:660
#, fuzzy
msgid " --resign <pkg>+ "
@@ -2054,7 +2052,7 @@ msgstr " --sign - genčre une signature PGP"
msgid "Could not open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -2084,7 +2082,7 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "Unable to write payload to %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2517,11 +2515,11 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "cannot get %s lock on database\n"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2550,12 +2548,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, fuzzy, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2581,104 +2579,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, fuzzy, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "aucun package n'a été spécifié pour l'installation"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2692,8 +2699,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2735,32 +2742,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "La construction a échoué.\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "La construction a échoué.\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -2770,94 +2777,94 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
#, fuzzy
msgid "unexpected ]"
msgstr "source de requęte inattendue"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
#, fuzzy
msgid "unexpected }"
msgstr "source de requęte inattendue"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -2866,7 +2873,7 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -3127,246 +3134,245 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr ""
" -f <file>+ - interroge le package ŕ qui appartient <file>"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "La construction a échoué.\n"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
#, fuzzy
msgid "not installed "
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/query.c:438
+#: lib/query.c:392
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "La construction a échoué.\n"
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-
-#: lib/query.c:585 lib/rpminstall.c:320
+#: lib/query.c:525
#, c-format
-msgid "%s does not appear to be a RPM package\n"
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:590
-#, c-format
-msgid "query of %s failed\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
#, fuzzy
msgid "no packages\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, fuzzy, c-format
msgid "no package triggers %s\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "aucun package n'a été spécifié pour l'installation"
@@ -3603,119 +3609,95 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/rpminstall.c:210
-#, fuzzy
-msgid "counting packages to install\n"
-msgstr "aucun package n'a été spécifié pour l'installation"
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, fuzzy, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, fuzzy, c-format
-msgid "%s cannot be installed\n"
-msgstr "aucun package n'a été spécifié pour l'installation"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, fuzzy, c-format
+msgid "%s cannot be installed\n"
+msgstr "aucun package n'a été spécifié pour l'installation"
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, fuzzy, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3948,48 +3930,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -4000,20 +3982,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
@@ -4218,6 +4200,20 @@ msgid "failed to create %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
#, fuzzy
+#~ msgid " --timecheck <secs> "
+#~ msgstr " --checksig <pkg>+ - vérifie la signature PGP"
+
+#, fuzzy
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr ""
+#~ " --time-check <s> - positionne l'intervalle de vérification ŕ S "
+#~ "secondes (0 le désactive)"
+
+#, fuzzy
+#~ msgid "counting packages to install\n"
+#~ msgstr "aucun package n'a été spécifié pour l'installation"
+
+#, fuzzy
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
@@ -4364,10 +4360,6 @@ msgstr "impossible d'ouvrir: %s\n"
#~ msgstr " qui matchent <pkg>"
#, fuzzy
-#~ msgid " -K <pkg>+ "
-#~ msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-
-#, fuzzy
#~ msgid " [--sign] [--nobuild] ]"
#~ msgstr " qui matchent <pkg>"
diff --git a/po/gl.po b/po/gl.po
index 7d139b2ee..0dc8b948b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -646,6 +646,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -737,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1467,6 +1463,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2303,11 +2303,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2336,12 +2336,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2367,104 +2367,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2478,8 +2487,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2521,32 +2530,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2556,92 +2565,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2650,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2869,241 +2878,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3339,117 +3347,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3672,48 +3657,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3724,20 +3709,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 7d139b2ee..0dc8b948b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -646,6 +646,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -737,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1467,6 +1463,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2303,11 +2303,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2336,12 +2336,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2367,104 +2367,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2478,8 +2487,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2521,32 +2530,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2556,92 +2565,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2650,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2869,241 +2878,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3339,117 +3347,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3672,48 +3657,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3724,20 +3709,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/id.po b/po/id.po
index 7d139b2ee..0dc8b948b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -646,6 +646,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -737,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1467,6 +1463,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2303,11 +2303,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2336,12 +2336,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2367,104 +2367,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2478,8 +2487,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2521,32 +2530,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2556,92 +2565,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2650,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2869,241 +2878,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3339,117 +3347,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3672,48 +3657,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3724,20 +3709,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/is.po b/po/is.po
index d195f465e..c16e57c25 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\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"
@@ -392,11 +392,11 @@ msgstr "gátt vefţjónsins eđa vefselsins"
msgid "query mode"
msgstr "fyrirspurnarhamur"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr " --dbpath <mappa> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -412,7 +412,7 @@ msgstr ""
msgid " --root <dir> "
msgstr " --root <mappa> "
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -663,6 +663,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " -i <pakkaskrá> "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -754,353 +759,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr " --checksig <pakki>+"
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr " -K <pakki>+ "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1493,6 +1490,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " -K <pakki>+ "
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1882,7 +1884,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Get ekki opnađ spec skrána %s: %s\n"
@@ -1912,7 +1914,7 @@ msgstr "Get ekki opnađ spec skrána %s: %s\n"
msgid "Unable to write payload to %s: %s\n"
msgstr "Get ekki opnađ spec skrána %s: %s\n"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2332,11 +2334,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr "get ekki opnađ pakka gagnagrunn í\n"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2365,12 +2367,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2396,104 +2398,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2507,8 +2518,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2550,32 +2561,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "Skrá %s: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "gat ekki búiđ til %s: %s\n"
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "Get ekki opnađ spec skrána %s: %s\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "Get ekki opnađ spec skrána %s: %s\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "gat ekki búiđ til %s: %s\n"
@@ -2585,92 +2596,92 @@ msgstr "gat ekki búiđ til %s: %s\n"
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2679,7 +2690,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2902,242 +2913,241 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "gat ekki búiđ til %s: %s\n"
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "get ekki opnađ pakka gagnagrunn í\n"
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "fyrirspurn á pakkann sem á <skrá>"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-
-#: lib/query.c:585 lib/rpminstall.c:320
+#: lib/query.c:525
#, c-format
-msgid "%s does not appear to be a RPM package\n"
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:590
-#, c-format
-msgid "query of %s failed\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "Get ekki opnađ spec skrána %s: %s\n"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3373,117 +3383,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "get ekki opnađ pakka gagnagrunn í\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "get ekki opnađ %s/packages.rpm\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3706,48 +3693,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "gat ekki búiđ til %s: %s\n"
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3758,20 +3745,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/it.po b/po/it.po
index 7d139b2ee..0dc8b948b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -646,6 +646,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -737,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1467,6 +1463,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2303,11 +2303,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2336,12 +2336,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2367,104 +2367,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2478,8 +2487,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2521,32 +2530,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2556,92 +2565,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2650,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2869,241 +2878,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3339,117 +3347,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3672,48 +3657,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3724,20 +3709,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 9b9b346c3..d817909a5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: 1999-12-01 22:49 +JST\n"
"Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
"Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -88,7 +88,7 @@ msgstr "ĽżĄźĽ˛ĽĂĽČ %s ÍѤ˺îŔŽĂć\n"
# build root [BuildRoot]
# net share [ĽÍĽĂĽČśŚÍ­]
# reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë]
-# $Id: ja.po,v 1.161 2001/03/22 23:39:05 jbj Exp $
+# $Id: ja.po,v 1.162 2001/04/23 20:57:01 jbj Exp $
#: rpm.c:224 rpmqv.c:391
#, c-format
msgid "rpm: %s\n"
@@ -406,11 +406,11 @@ msgstr "http (¤â¤ˇ¤Ż¤ĎĽ×ĽíĽ­Ľˇ)ĽľĄźĽĐ¤ÎĽÝĄźĽČČÖšć"
msgid "query mode"
msgstr "Ě䤤šç¤ď¤ťĽâĄźĽÉ"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "ĽÇĄźĽżĽŮĄźĽšÍѤμǼŁĽěĽŻĽČĽę¤Č¤ˇ¤Ć <dir> ¤ňÍѤ¤¤Ţ¤š"
@@ -427,7 +427,7 @@ msgstr "ĽŘĽĂĽŔĽŐĽŠĄźĽŢĽĂĽČ¤Č¤ˇ¤Ć <qfmt> ¤ňťČÍѤˇ¤Ţ¤š (-i ¤ÎĆŻ¤­¤ň´Ţ¤ß¤Ţ¤š)"
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "ĽČĽĂĽ×ĽÇĽŁĽěĽŻĽČĽę¤Č¤ˇ¤Ć <dir> ¤ňťČÍѤˇ¤Ţ¤š"
@@ -708,6 +708,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "ĽŃĽĂĽąĄźĽ¸¤ňşď˝ü(Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë)¤ˇ¤Ţ¤š"
@@ -804,19 +809,11 @@ msgstr ""
msgid "do not execute any stages"
msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "ĽżĽ¤ĽŕĽÁĽ§ĽĂĽŻ´ü¸Â¤ňŔßÄꤡ¤Ţ¤š(0¤ÇĚľ¸ú)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -825,64 +822,64 @@ msgstr ""
"\t\t\t Ľ¸¤ňşîŔŽ¤ˇĄ˘specĽŐĽĄĽ¤ĽëĄ˘Ľ˝ĄźĽšĽŐĽĄĽ¤ĽëĄ˘ĽŃĽĂĽÁĄ˘\n"
"\t\t\t Ľ˘Ľ¤ĽłĽó¤ňşď˝ü¤ˇ¤Ţ¤š"
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "--rebuild ¤Ëť÷¤Ć¤¤¤Ţ¤š¤ŹĄ˘ĽŃĽĂĽąĄźĽ¸¤ňşîŔŽ¤ˇ¤Ţ¤ť¤ó"
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë˝đĚž¤ˇ¤Ţ¤š(¸˝şß¤Î˝đĚž¤ĎźÎ¤Ć¤é¤ě¤Ţ¤š)"
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë˝đĚž¤ňÄɲ䡤ޤš"
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "PGP ˝đĚž¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
#, fuzzy
msgid "skip any GPG signatures"
msgstr "GPG ˝đĚž¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "MD5 ˝đĚž¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "Í­¸ú¤ĘĽÇĄźĽżĽŮĄźĽš¤ŹÂ¸şß¤š¤ë¤ł¤Č¤ňłÎ¤Ť¤á¤Ţ¤š"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "´ű¸¤ÎĽÇĄźĽżĽŮĄźĽš¤Ť¤éĽÇĄźĽżĽŮĄźĽš¤ňşĆš˝Ăۤˇ¤Ţ¤š"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -890,7 +887,7 @@ msgstr ""
"-q ¤ČĆąÍͤËĆą¤¸ĽŃĽĂĽąĄźĽ¸ťŘÄ꼪Ľ×ĽˇĽçĽó¤ňźč¤ę\n"
"ĽÇĄźĽżĽŮĄźĽšĂć¤Îľö˛Ä°Ŕ­¤ËŔßÄꤡ¤Ţ¤š"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -898,84 +895,84 @@ msgstr ""
"-q ¤ČĆąÍͤËĆą¤¸ĽŃĽĂĽąĄźĽ¸ťŘÄ꼪Ľ×ĽˇĽçĽó¤ňźč¤ę\n"
"ĽÇĄźĽżĽŮĄźĽšĂć¤Î˝ęÍ­źÔ¤ČĽ°ĽëĄźĽ×¤ËŔßÄꤡ¤Ţ¤š"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "°ě¤Ä¤ÎĽáĽ¸ĽăĄźĽâĄźĽÉ¤Î¤ß¤ňťŘÄꤡ¤Ć¤Ż¤Ŕ¤ľ¤¤"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u ¤Č --uninstall ¤Ď¤â¤Ď¤äĆ°şî¤ˇ¤Ţ¤ť¤ó\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "-e ¤Ť --erase ¤ňťČ¤Ă¤Ć¤Ż¤Ŕ¤ľ¤¤\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "şĆÇŰĂÖ¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "şĆÇŰĂÖ¤Ď = ¤ň´Ţ¤ó¤Ç¤¤¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "şĆÇŰĂÖ¤Ď = ¤ÎźĄ¤Ë / ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "˝üł°¤š¤ëĽŃĽš¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, fuzzy, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "°úżô˝čÍý(%d)¤Ç¤ÎĆâÉôĽ¨ĽéĄź :-(\n"
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "Ě䤤šç¤ď¤ť/¸ĄžÚ¤Ď°ěĹ٤˰ě¤Ä¤ˇ¤ŤźÂšÔ¤Ç¤­¤Ţ¤ť¤ó"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
#, fuzzy
msgid "unexpected query flags"
msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽŐĽéĽ°"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
#, fuzzy
msgid "unexpected query format"
msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽŐĽŠĄźĽŢĽĂĽČ"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽ˝ĄźĽš"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"Ľ¤ĽóĽšĽČĄźĽëĄ˘Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉĄ˘Ľ˝ĄźĽšşď˝üĄ˘ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľëşď˝üťţ¤Î¤ßśŻŔŠ¤Ç¤­¤"
"ޤš"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "ĽŐĽĄĽ¤Ľë¤ĎĽŃĽĂĽąĄźĽ¸Ľ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßşĆÇŰĂ֤Ǥ­¤Ţ¤š"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ¤â¤ˇ¤Ż¤Ď --relocate ¤Î¤¤¤ş¤ě¤Ť¤Î¤ßťČÍѤǤ­¤Ţ¤š"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
@@ -983,87 +980,87 @@ msgstr ""
"--relocate ¤Č --excludepath "
"¤Ďżˇ¤ˇ¤¤ĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤š¤ë¤Č¤­¤Î¤ßťČÍѤǤ­¤Ţ¤š"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix ¤ĎżˇľŹ¤ËĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤š¤ë¤Č¤­¤Î¤ßťČÍѤǤ­¤Ţ¤š"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ¤Ř¤Î°úżô¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Í¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs ¤Č --includedocs ¤Ď¤É¤Á¤é¤Ť°ěĘý¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr "-ignoreos ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "-ignoresize ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ¤ĎĽŃĽĂĽąĄźĽ¸¤Îşď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr "--noscripts ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘¸ĄžÚťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--allfiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1071,13 +1068,13 @@ msgid ""
msgstr ""
"--nodeps ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎşîŔŽĄ˘Ľ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘¸ĄžÚťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘şîŔŽťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1085,101 +1082,101 @@ msgstr ""
"--root (-r) "
"¤ĎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘Ě䤤šç¤ď¤ťĄ˘ĽÇĄźĽżĽŮĄźĽšşĆš˝ĂŰťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ¤Î°úżô¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Í¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage ¤ĎĽ˘ĽĂĽ×Ľ°ĽěĄźĽÉťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp ¤Ď˝đĚž¸Ąşşťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg ¤Ď˝đĚž¸Ąşşťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nomd5 ¤Ď˝đĚž¸Ąşş¤ČĽŃĽĂĽąĄźĽ¸¸ĄžÚťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr "˝đĚž¤š¤ë¤ż¤á¤ÎĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó\n"
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤ËĽ˘ĽŻĽťĽš¤Ç¤­¤Ţ¤ť¤ó\n"
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
#, fuzzy
msgid "pgp not found: "
msgstr "pgp ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó: "
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr "ĽŃĽšĽŐĽěĄźĽş¤ňĆţÎϤˇ¤Ć¤Ż¤Ŕ¤ľ¤¤: "
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "ĽŃĽšĽŐĽěĄźĽşĽÁĽ§ĽĂĽŻ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "ĽŃĽšĽŐĽěĄźĽş¤ĎŔľžď¤Ç¤šĄĽ\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤ĽëĂć¤ÎĚľ¸ú¤Ę %%_signature ĄŁ\n"
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign ¤ĎĽŃĽĂĽąĄźĽ¸şîŔŽťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr "źÂšÔźşÇÔ\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¤Î°úżô¤Ź´Ö°ă¤Ă¤Ć¤¤¤Ţ¤š"
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "˝đĚž¸Ąşş¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "˝đĚž¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "Á´ĽŃĽĂĽąĄźĽ¸¤ÎĚ䤤šç¤ď¤ť¤Î¤ż¤á¤Ë͞ʏ¤Ę°úżô¤Ź¤˘¤ę¤Ţ¤š"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "Á´ĽŃĽĂĽąĄźĽ¸¤Î¸ĄžÚ¤Î¤ż¤á¤Ë͞ʏ¤Ę°úżô¤Ź¤˘¤ę¤Ţ¤š"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "¸ĄžÚ¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
@@ -1620,6 +1617,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -2029,7 +2031,7 @@ msgstr "˝đĚž¤ÎŔ¸ŔŽĂć: %d\n"
msgid "Could not open %s: %s\n"
msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
@@ -2059,7 +2061,7 @@ msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s"
msgid "Unable to write payload to %s: %s\n"
msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr "˝ń¤­šţ¤ßĂć: %s\n"
@@ -2509,11 +2511,11 @@ msgstr "ĽÇĄźĽżĽŮĄźĽšĽâĄźĽÉ 0x%x ¤ÎĽŞĄźĽ×Ľó (%s)\n"
msgid "cannot get %s lock on database\n"
msgstr "ĽÇĄźĽżĽŮĄźĽš¤Î %s ¤ňĽíĽĂĽŻ¤Ç¤­¤Ţ¤ť¤ó"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr "˝üł°"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr "śŚÍ­"
@@ -2542,12 +2544,12 @@ msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "ĽÇĄźĽżĽŮĄźĽšĽâĄźĽÉ 0x%x ¤ÎĽŞĄźĽ×Ľó (%s)\n"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, fuzzy, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "ĽÇĄźĽżĽŮĄźĽš¤Î %s ¤ňĽíĽĂĽŻ¤Ç¤­¤Ţ¤ť¤ó"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, fuzzy, c-format
msgid "locked db index %s/%s\n"
msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
@@ -2573,7 +2575,7 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2582,97 +2584,106 @@ msgstr ""
"\"B\" ¤Î°Í¸Ŕ­¤Ď epoch ¤ňÉŹÍפȤˇ¤Ţ¤š(\"A\"¤ČĆą¤¸¤Ç¤˘¤ë¤Č˛žÄꤡ¤Ć)\n"
"\tA %s\tB %s\n"
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, fuzzy, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr "%s: %s ¤ĎĽŐĽĄĽ¤ĽëĽęĽšĽČ¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, fuzzy, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr "%s: %s ¤Ď provide ¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
-#: lib/depends.c:1073
-#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
-msgstr ""
+#: lib/depends.c:1071
+#, fuzzy, c-format
+msgid "%s: %-45s %-s (cached)\n"
+msgstr "%s: %s ¤Ď db ĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ\n"
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, fuzzy, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr "%s: %s ¤Ď rpmrc ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, fuzzy, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr "%s: %s ¤Ď rpmrc ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, fuzzy, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr "%s: %s ¤Ď db ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, fuzzy, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr "%s: %s ¤Ď db ĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ\n"
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, fuzzy, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "%s: %s ¤ĎĽŃĽĂĽąĄźĽ¸¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, fuzzy, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "%s ¤ČśĽšç¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š: %s\n"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, fuzzy, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2691,8 +2702,8 @@ msgstr ""
"http://www.rpm.org ¤â¤ˇ¤Ż¤Ď rpm-list@redhat.com ĽáĄźĽęĽóĽ°ĽęĽšĽČ¤Ť¤é\n"
"žÜşŮ¤ĘžđĘ󤏟čĆŔ¤Ç¤­¤Ţ¤šĄŁ\n"
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr "(żôťú¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó)"
@@ -2734,32 +2745,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "%d šÔĚÜ: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆĘݸ¤ľ¤ě¤Ţ¤š"
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s ¤ňşď˝ü¤Ç¤­¤Ţ¤ť¤ó - ĽÇĽŁĽěĽŻĽČĽę¤Źśő¤Ç¤˘¤ę¤Ţ¤ť¤ó"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s ¤Î rmdir ¤ËźşÇÔ: %s"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆşîŔŽ¤ľ¤ě¤Ţ¤š"
@@ -2770,92 +2781,92 @@ msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆşîŔŽ¤ľ¤ě¤Ţ¤š"
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabDate() RPM_STRING_TYPE ĽŤĽŚĽóĽČ¤Ď 1 ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤óĄŁ\n"
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr "ĽÇĄźĽżĽżĽ¤Ľ× %d ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "headerAddEntry() ¤ÎÉÔŔľ¤ĘĽŤĽŚĽóĽČ: %d\n"
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr "% ¤Î¸ĺ¤Ë { ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr "%{ ¤Î¸ĺ¤Ë } ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr "śő¤ÎĽżĽ°ĽŐĽŠĄźĽŢĽĂĽČ"
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr "śő¤ÎĽżĽ°Ěž"
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr "ÉÔĚŔ¤ĘĽżĽ°"
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr "ÇŰÎó¤Î¸ĺ¤Ë ] ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr "Í˝´ü¤ť¤Ě ]"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr "Í˝´ü¤ť¤Ě }"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr "ź°Ăć¤Ç ? ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr "ź°Ăć¤Ç ? ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr "ź°Ăć¤Ë } ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr "°Ę˛ź¤Î ? ĽľĽÖź°¤Î ¤Ë: ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr "ź°Ăć¤Ç : ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr "ź°¤Î˝Ş¤ę¤Ë | ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr "(ÉÔĚŔ¤ĘĽżĽ¤Ľ×)"
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "°ěťţĽŐĽĄĽ¤Ľë %s ¤ÎşîŔŽĽ¨ĽéĄź"
@@ -2866,7 +2877,7 @@ msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"ĽáĽ¸ĽăĄźČÖšć <=3 ¤ÎĽŃĽĂĽąĄźĽ¸¤Î¤ß¤ł¤ÎĽĐĄźĽ¸ĽçĽó¤Î RPM ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤š"
-#: lib/package.c:179
+#: lib/package.c:181
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
@@ -3121,255 +3132,254 @@ msgstr "¤Ď %s-%s-%s ¤ËÉŹÍפȤľ¤ě¤Ć¤¤¤Ţ¤š\n"
msgid " conflicts with %s-%s-%s\n"
msgstr " %s-%s-%s ¤ČśĽšç¤ˇ¤Ţ¤š\n"
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď°Ű¤Ę¤ëĽ˘ĄźĽ­ĽĆĽŻĽÁĽă¸ţ¤ą¤Ç¤š"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď°Ű¤Ę¤ë OS ¸ţ¤ą¤Ç¤š"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤š"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, fuzzy, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
"ĽŐĽĄĽ¤Ľë %s ¤Ď %s-%s-%s ¤Č %s-%s-%s ¤ÎĽ¤ĽóĽšĽČĄźĽë¤ÎĽŐĽĄĽ¤Ľë¤ČśĽšç¤ˇ¤Ć¤¤¤Ţ¤š"
-#: lib/problems.c:121
+#: lib/problems.c:140
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
"%s-%s-%s ¤ÎĽ¤ĽóĽšĽČĄźĽë¤Ť¤é¤ÎĽŐĽĄĽ¤Ľë %s ¤ĎĽŃĽĂĽąĄźĽ¸ %s-%s-%s "
"¤Ť¤é¤ÎĽŐĽĄĽ¤Ľë¤ČśĽšç¤ˇ¤Ć¤¤¤Ţ¤š"
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
"ĽŃĽĂĽąĄźĽ¸ %s-%s-%s (%s-%s-%s¤č¤ę¤âżˇ¤ˇ¤¤¤â¤Î) "
"¤Ď¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤š"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, fuzzy, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
"ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ÎĽ¤ĽóĽšĽČĄźĽë¤Ď %ld%cb ¤ŹÉŹÍפǤš(%s "
"ĽŐĽĄĽ¤ĽëĽˇĽšĽĆĽŕžĺ¤Ç)"
-#: lib/problems.c:141
+#: lib/problems.c:160
#, fuzzy, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
"ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ÎĽ¤ĽóĽšĽČĄźĽë¤Ď %ld%cb ¤ŹÉŹÍפǤš(%s "
"ĽŐĽĄĽ¤ĽëĽˇĽšĽĆĽŕžĺ¤Ç)"
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, fuzzy, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "ÉÔĚŔ¤ĘĽ¨ĽéĄź %d ¤ŹĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ÎÁŕşîĂć¤Ë¤Ş¤­¤Ţ¤ˇ¤ż"
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "%s ¤ňşîŔŽ¤Ç¤­¤Ţ¤ť¤ó: %s\n"
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "%s ¤Ř˝ń¤­šţ¤á¤Ţ¤ť¤ó"
-#: lib/psm.c:604
+#: lib/psm.c:605
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ź´üÂÔ¤ľ¤ě¤Ţ¤šĄ˘ĽĐĽ¤ĽĘĽę¤Ď¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż"
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ď .spec ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ"
-#: lib/psm.c:961
+#: lib/psm.c:962
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ"
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "ĽŃĽĂĽąĄźĽ¸: %s-%s-%s ĽŐĽĄĽ¤ĽëĽĆĽšĽČ = %d\n"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, fuzzy, c-format
msgid "user %s does not exist - using root\n"
msgstr "ĽćĄźĽś %s ¤Ď¸şß¤ˇ¤Ţ¤ť¤ó - root ¤ňťČÍѤˇ¤Ţ¤š"
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "Ľ°ĽëĄźĽ× %s ¤Ď¸şß¤ˇ¤Ţ¤ť¤ó - root ¤ňťČÍѤˇ¤Ţ¤š"
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤ÎĽ˘ĄźĽŤĽ¤ĽÖ¤Îż­Äš¤ËźşÇÔ %s%s: %s"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
#, fuzzy
msgid " on file "
msgstr "ĽŐĽĄĽ¤Ľëžĺ"
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "ĽÝĽšĽČĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "ĽŐĽŠĄźĽŢĽĂĽČĂć¤ÎĽ¨ĽéĄź: %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr "ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó"
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr "ÄĚžď"
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr "ĂÖ¤­´š¤¨¤é¤ě¤Ć¤¤¤Ţ¤š"
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr "Ľ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr "ĽÍĽĂĽČśŚÍ­"
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr "(̤ĂΤΠ%3d)"
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr "(˛ż¤ÎžőÂ֤⤢¤ę¤Ţ¤ť¤ó)"
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "ĽŃĽĂĽąĄźĽ¸¤ĎĽŐĽĄĽ¤Ľë˝ęÍ­źÔ¤ä id ĽęĽšĽČ¤ň¤É¤Á¤é¤âťý¤Ă¤Ć¤¤¤Ţ¤ť¤ó"
-#: lib/query.c:438
+#: lib/query.c:392
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "%s ¤ňşď˝ü(unlink)¤Ç¤­¤Ţ¤ť¤ó: %s\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n"
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr "ľěˇÁź°¤ÎĽ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó\n"
-
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
-msgstr "%s ¤Ď RPM ĽŃĽĂĽąĄźĽ¸¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
-
-#: lib/query.c:590
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr "%s ¤Ř¤ÎĚ䤤šç¤ď¤ť¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: lib/query.c:624
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
+msgstr "ľěˇÁź°¤ÎĽ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó\n"
+
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
+
+#: lib/query.c:599
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë %s ¤Ř¤ÎĚ䤤šç¤ď¤ť¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤żĄ˘ĽŃĄźĽš¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/query.c:647
+#: lib/query.c:622
#, fuzzy
msgid "no packages\n"
msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "Ľ°ĽëĄźĽ× %s ¤Ë°¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr "%s ¤ňĽČĽęĽŹĄź¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr "%s ¤ňÉŹÍפȤš¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr "%s ¤ňÄ󜥤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s: %s\n"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ď¤É¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤â°¤ˇ¤Ć¤¤¤Ţ¤ť¤ó\n"
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "Ěľ¸ú¤ĘĽŃĽĂĽąĄźĽ¸ČÖšć: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ĽěĽłĄźĽÉČÖšć %d\n"
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n"
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
@@ -3610,118 +3620,95 @@ msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤Îşď˝üźşÇÔ: %s\n"
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëĽŃĽĂĽąĄźĽ¸¤ňżô¤¨¤Ć¤¤¤Ţ¤š\n"
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr "ĽŔĽŚĽóĽíĄźĽÉ¤š¤ëĽŃĽĂĽąĄźĽ¸¤ňĂľ¤ˇ¤Ć¤¤¤Ţ¤š\n"
-
-#: lib/rpminstall.c:234
-#, fuzzy, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n"
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr "%s ¤ňźčĆŔ¤ˇ¤Ć¤¤¤Ţ¤š\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr "%s ¤Č¤ˇ¤Ć...\n"
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n"
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ňźčĆŔ¤ˇ¤Ţ¤ˇ¤ż\n"
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, fuzzy, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "ĽŐĽĄĽ¤Ľë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s"
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, fuzzy, c-format
-msgid "%s cannot be installed\n"
-msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ţ¤ť¤ó\n"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ť¤é¤ÎĆɤߚţ¤ßĽ¨ĽéĄź "
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ë¤Ď¤č¤ężˇ¤ˇ¤¤ RPM ¤ÎĽĐĄźĽ¸ĽçĽó¤ŹÉŹÍפǤš\n"
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, fuzzy, c-format
+msgid "%s cannot be installed\n"
+msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ţ¤ť¤ó\n"
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n"
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "°Í¸Ŕ­¤ÎˇçÇĄ:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr "ĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, fuzzy, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "ĽŐĽĄĽ¤Ľë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s"
+
+#: lib/rpminstall.c:580
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¤ĎĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤡ¤Ć¤¤¤Ţ¤š\n"
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "¤ł¤ě¤é¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤š¤ë¤Č°Í¸Ŕ­¤ňÇ˲ő¤ˇ¤Ţ¤š:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n"
@@ -3964,50 +3951,50 @@ msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤Ľë¤Ë \"%%_pgp_name\" ¤ňŔßÄꤡ¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤Ľë¤Ë \"%%_pgp_name\" ¤ňŔßÄꤡ¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "OS ¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
-#: lib/transaction.c:617
-#, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "ĽÇĽŁĽěĽŻĽČĽę¤Î˝üł°: %s\n"
-
-#: lib/transaction.c:741
+#: lib/transaction.c:771
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s ¤Ď missingok ĽŐĽéĽ°¤Î¤ż¤áĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š\n"
+#: lib/transaction.c:1359
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "ĽÇĽŁĽěĽŻĽČĽę¤Î˝üł°: %s\n"
+
#: lib/verify.c:61
#, fuzzy
msgid "don't verify files in package"
@@ -4018,26 +4005,26 @@ msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
msgid "do not execute %verifyscript (if any)"
msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: lib/verify.c:253
+#: lib/verify.c:257
#, fuzzy
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
"ĽŃĽĂĽąĄźĽ¸¤Ď ĽćĄźĽśĚž¤Č id "
"ĽęĽšĽČ¤ÎΞĘý¤Źˇç¤ą¤Ć¤¤¤Ţ¤š(¤ł¤ě¤Ďˇč¤ˇ¤ĆľŻ¤­¤Ć¤Ď¤Ę¤é¤Ę¤¤)"
-#: lib/verify.c:271
+#: lib/verify.c:275
#, fuzzy
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
"ĽŃĽĂĽąĄźĽ¸¤ĎĽ°ĽëĄźĽ×Ěž¤Č id "
"ĽęĽšĽČ¤ÎΞĘý¤Źˇç¤ą¤Ć¤¤¤Ţ¤š(¤ł¤ě¤Ďˇč¤ˇ¤ĆľŻ¤­¤Ć¤Ď¤Ę¤é¤Ę¤¤)"
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "%s ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó\n"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "%s-%s-%s ¤Î¤ż¤á¤Î°Í¸Ŕ­¤ňËţ¤ż¤ˇ¤Ć¤¤¤Ţ¤ť¤ó:"
@@ -4261,6 +4248,28 @@ msgstr "url ĽÝĄźĽČ¤Ďżôťú¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó\n"
msgid "failed to create %s: %s\n"
msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "ĽżĽ¤ĽŕĽÁĽ§ĽĂĽŻ´ü¸Â¤ňŔßÄꤡ¤Ţ¤š(0¤ÇĚľ¸ú)"
+
+#~ msgid "%s does not appear to be a RPM package\n"
+#~ msgstr "%s ¤Ď RPM ĽŃĽĂĽąĄźĽ¸¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
+
+#~ msgid "counting packages to install\n"
+#~ msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëĽŃĽĂĽąĄźĽ¸¤ňżô¤¨¤Ć¤¤¤Ţ¤š\n"
+
+#~ msgid "found %d packages\n"
+#~ msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
+
+#~ msgid "looking for packages to download\n"
+#~ msgstr "ĽŔĽŚĽóĽíĄźĽÉ¤š¤ëĽŃĽĂĽąĄźĽ¸¤ňĂľ¤ˇ¤Ć¤¤¤Ţ¤š\n"
+
+#, fuzzy
+#~ msgid "skipping %s - rpmGlob failed(%d)\n"
+#~ msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n"
+
+#~ msgid "retrieved %d packages\n"
+#~ msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ňźčĆŔ¤ˇ¤Ţ¤ˇ¤ż\n"
+
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
diff --git a/po/ko.po b/po/ko.po
index 7d139b2ee..0dc8b948b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -646,6 +646,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -737,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1467,6 +1463,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2303,11 +2303,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2336,12 +2336,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2367,104 +2367,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2478,8 +2487,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2521,32 +2530,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2556,92 +2565,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2650,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2869,241 +2878,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3339,117 +3347,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3672,48 +3657,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3724,20 +3709,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/no.po b/po/no.po
index da65fbd0f..cb9b7cac1 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: 2000-08-17 20:22+02:00\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -394,11 +394,11 @@ msgstr "portnummer for http tjener (eller proxy)"
msgid "query mode"
msgstr "spřrringsmodus"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr " --dbpath <katalog> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "bruk <katalog> som katalog for databasen"
@@ -414,7 +414,7 @@ msgstr "bruk <spfmt> som headerformat (impliserer --info)"
msgid " --root <dir> "
msgstr " --root <katalog> "
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "bruk <katalog> som toppnivĺkatalog"
@@ -670,6 +670,11 @@ msgstr ""
msgid " --erase <package>"
msgstr " --erase <pakke>"
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " -i <pakkefil> "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "slett (avinstallér) pakke"
@@ -763,19 +768,11 @@ msgstr "bygg pakkene for mĺl plattform1...plattformN."
msgid "do not execute any stages"
msgstr "ikke kjřr noen steg"
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr " --timecheck <sek> "
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "sett tidssjekk til <sek> sekunder (0 slĺr av)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <kilde_pakke>"
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -783,63 +780,63 @@ msgstr ""
"installér kildepakke, bygg binćrpakke og fjern specfil, kilder, patcher og "
"ikoner."
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr " --recompile <kilde_pakke>"
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "som --rebuild, men ikke bygg noen pakke"
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr " --resign <pakke>+ "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "signér en pakke (forkast nĺvćrende signatur)"
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr " --addsign <pakke>+ "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "legg til signatur til en pakke"
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr " --checksig <pakke>+"
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr " -K <pkg>+ "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "verifisér pakkesignatur"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "hopp over PGP-signaturer"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr "hopp over GPG-signaturer"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "hopp over MD5-signaturer"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "sjekk at en gyldig database eksisterer"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "bygg opp igjen databasen fra den eksisterende databasen"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -847,7 +844,7 @@ msgstr ""
"sett filrettigheter til de samme som i pakkedatabasen ved ĺ bruke samme "
"alternativer for pakkespesifikasjon som med -q"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -855,271 +852,271 @@ msgstr ""
"set fileierskap og gruppe til de som er i pakkedatabasen ved ĺ bruke samme "
"alternativer for pakkespesifikasjon som -q"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "kun ett střrre modi kan spesifiseres"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u og --uninstall er utgĺtt og virker ikke lengre.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Bruk -e eller --erase i stedet.\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "relokasjoner mĺ begynne med en /"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "relokasjoner mĺ inneholde et ="
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "relokasjoner mĺ ha et / etter ="
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr "eksluderingssti mĺ begynne med en /"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "én type spřrring/verifisering kan utfřres om gangen"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr "uventede flagg for spřrring"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr "ventet spřrringsformat"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "uventet spřrringskilde"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "filer kan kun omplasseres under pakkeinstallasjon"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "kune en av --prefix eller --relocate kan brukes"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate og --excludepath kan kun brukes ved installasjon av nye pakker"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "argumenter til --prefix mĺ begynne med en /"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1525,6 +1522,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " -K <pkg>+ "
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1915,7 +1917,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
@@ -1945,7 +1947,7 @@ msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
msgid "Unable to write payload to %s: %s\n"
msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2367,11 +2369,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr "kan ikke ĺpne pakkedatabase i %s\n"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2400,12 +2402,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2431,104 +2433,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2542,8 +2553,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2585,32 +2596,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "Fil %s: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "kunne ikke opprette %s: %s\n"
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "lesing feilet: %s (%d)"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "lesing feilet: %s (%d)"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "lesing feilet: %s (%d)"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "kunne ikke opprette %s: %s\n"
@@ -2620,92 +2631,92 @@ msgstr "kunne ikke opprette %s: %s\n"
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "feil under lesing fra fil %s\n"
@@ -2714,7 +2725,7 @@ msgstr "feil under lesing fra fil %s\n"
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2943,242 +2954,241 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "kan ikke ĺpne %s: %s\n"
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "kan ikke ĺpne %s: %s\n"
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "spřr pakke som eier <fil>"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "ikke kjřr noen steg"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-
-#: lib/query.c:585 lib/rpminstall.c:320
+#: lib/query.c:525
#, c-format
-msgid "%s does not appear to be a RPM package\n"
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:590
-#, c-format
-msgid "query of %s failed\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "lesing feilet: %s (%d)"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3414,118 +3424,95 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "filer kan kun omplasseres under pakkeinstallasjon"
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kan ikke ĺpne pakkedatabase i %s\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, 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:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fant %d kilde- og %d binćrpakker\n"
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "feilede avhengigheter:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr "installerer binćrpakker\n"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "kan ikke ĺpne %s/packages.rpm\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" spesifiserer flere pakker\n"
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "fjerning av disse pakkene vil řdelegge avhengigheter:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke ĺpne %s: %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
@@ -3748,48 +3735,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "kunne ikke opprette %s: %s\n"
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3801,20 +3788,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr "ikke kjřr noen steg"
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "mangler andre ':' ved %s:%d"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
@@ -4018,6 +4005,12 @@ msgstr "url-port mĺ vćre et tall\n"
msgid "failed to create %s: %s\n"
msgstr "kunne ikke opprette %s: %s\n"
+#~ msgid " --timecheck <secs> "
+#~ msgstr " --timecheck <sek> "
+
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "sett tidssjekk til <sek> sekunder (0 slĺr av)"
+
#, fuzzy
#~ msgid " %s {--rebuilddb} [--rcfile <file:...>] [--dbpath <dir>]\n"
#~ msgstr " rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]"
diff --git a/po/pl.po b/po/pl.po
index 46645d8eb..33f26e4ad 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\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"
@@ -418,11 +418,11 @@ msgstr "numer portu serwera http (albo proksy)"
msgid "query mode"
msgstr "tryb odpytywania"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr " --dbpath <katalog> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "użyj <katalog> jako katalogu bazy pakietów"
@@ -439,7 +439,7 @@ msgstr "użyj <format zapytania> jako formatu nagłówka (dotyczy -i)"
msgid " --root <dir> "
msgstr " --root <katalog> "
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "użyj <katalogu> jako katalogu najwyższego poziomu"
@@ -696,6 +696,11 @@ msgstr ""
msgid " --erase <package>"
msgstr " --erase <pakiet>"
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " --resign <pakiet>+ "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "usuń (odinstaluj) pakiet"
@@ -791,19 +796,11 @@ msgstr "buduj pakiety dla platform docelowych platforma1...platformaN."
msgid "do not execute any stages"
msgstr "nie wykonuj żadnych etapów"
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr " --timecheck <sekundy>"
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "ustaw sprawdzanie czasu do ilości <sekund> (0 wyłącza)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <pkt_źródł> "
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -811,65 +808,65 @@ msgstr ""
"instaluj pakiet źródłowy, buduj pakiet binarny i usuń plik spec, źródła, "
"łaty i ikony"
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr " --recompile <pkt_źródł>"
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "jak --rebuild, ale nie buduj żadnych pakietów"
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr " --resign <pakiet>+ "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "podpisz pakiet (porzuć bierzącą sygnaturę)"
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr " --addsign <pakiet>+ "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "dodaj sygnaturę do pakietu"
-#: rpm.c:547
+#: rpm.c:545
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <pakiet>+ "
-#: rpm.c:548
+#: rpm.c:546
#, fuzzy
msgid " -K <pkg>+ "
msgstr " --resign <pakiet>+ "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "sprawdź sygnaturę pakietu"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "pomiń wszelkie sygnatury PGP"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr "pomiń wszelkie sygnatury GPG"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "pomiń wszelkie sygnatury MD5"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "upewnij się, że poprawna baza istnieje"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "przebuduj istniejącą bazę"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -877,7 +874,7 @@ msgstr ""
"ustaw prawa dostępu takie jak zapisano w bazie pakietów (używa tych samych "
"opcji co -q)"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -885,145 +882,145 @@ msgstr ""
"ustaw właściciela i grupę takie jak zapisano w bazie pakietów (używa tych "
"samych opcji co -q)"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "tylko jeden główny tryb pracy może być podany"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u i --uninstall nie są już obsługiwane i nie pracują.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Użyj -e lub --erase\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "drzewa przesunięć muszą zaczynać sie od /"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "specyfikacja przesunięcia musi zawierać ="
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "specyfikacja przesunięcia musi zawierać / po ="
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr "ścieżki wyłączeń muszą się zaczynać od /"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Błąd wewnętrzny w przetwarzaniu argumentu (%d) :-(\n"
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "tylko jeden typ odpytywania/sprawdzania można wykonać na raz"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr "błędna konstrukcja argumentów odpytywania"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr "błędna konstrukcja argumentów odpytywania"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "błędna konstrukcja argumentów odpytywania"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "tylko instalację, uaktualnienie i usuwanie źródeł można wymusić"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "przesuwania plików można dokonać tylko w trakcie instalacji"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "nie można jednocześnie użyć --prefix i --relocate"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate i --excludepath można użyć tylko w trakcie instalacji nowych "
"pakietów"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix można użyć tylko w trakcie instalacji nowych pakietów"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty dla --prefix muszą się rozpoczynać od /"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) można użyć tylko w trakcie instalacji pakietów"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent można użyć tylko w trakcie instalacji pakietów"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles można użyć tylko w trakcie instalacji pakietów"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs można użyć tylko w trakcie instalacji pakietów"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs można użyć tylko w trakcie instalacji pakietów"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs można użyć tylko w trakcie instalacji pakietów"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "nie można jednocześnie użyć --excludedocs i --includedocs"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch można użyć tylko w trakcie instalacji pakietów"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos można użyć tylko w trakcie instalacji pakietów"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize można użyć tylko w trakcie instalacji pakietów"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches można użyć tylko w trakcie usuwania pakietów"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles można użyć tylko w trakcie instalacji pakietów"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb można użyć tylko w trakcie instalacji lub usuwania pakietów"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
@@ -1032,19 +1029,19 @@ msgstr ""
"--noscripts można użyć tylko w trakcie instalacji, usuwania lub sprawdzania "
"pakietów"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--allfiles można użyć tylko w trakcie instalacji pakietów"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb można użyć tylko w trakcie instalacji lub usuwania pakietów"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1053,14 +1050,14 @@ msgstr ""
"--nodeps można użyć tylko w trakcie budowania, instalacji, usuwania lub "
"sprawdzania pakietów"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test można użyć tylko w trakcie instalacji, usuwania lub budowania pakietów"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1068,98 +1065,98 @@ msgstr ""
"--root (-r) można użyć tylko w trakcie instalacji, usuwania, sprawdzania "
"pakietów lub przebudowywania bazy"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty dla --root (-r) muszą się rozpoczynać od /"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage można użyć tylko podczas aktualizacji"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp można użyć tylko w trakcie sprawdzania sygnatury"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg można użyć tylko podczas sprawdzania sygnatury"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
"--nomd5 można użyć tylko podczas sprawdzania sygnatury i weryfkiacji pakietu"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr "brak dostępu do pliku %s\n"
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr "nie znaleziono pgp: "
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr "Podaj hasło: "
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "Weryfikacja hasła nieudana\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "Hasło jest prawidłowe.\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Błędny %%_signature spec w pliku makra.\n"
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign można użyć tylko w trakcie budowania pakietu"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr "wykonanie nie powiodło się\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "nieoczekiwane argumenty dla --querytags "
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "nie podano nazwy pakietu do sprawdzenia sygnatury"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "nie podano nazwy pakietu do podpisania"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "nie podano nazw plików do usunięcia"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "nie podano nazw plików do zainstalowania"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "zbyt wiele argumentów dla odpytywania wszystkich pakietów"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "nie podano argumentów dla trybu zapytań"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr "zbyt wiele argumentów dla weryfikacji wszystkich pakietów"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "nie podano argumentów dla sprawdzania"
@@ -1607,6 +1604,11 @@ msgstr " -U <nazwa pakietu> "
msgid " --erase <package>"
msgstr " --erase <pakiet>"
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " --resign <pakiet>+ "
+
#: rpmqv.c:660
#, fuzzy
msgid " --resign <pkg>+ "
@@ -2020,7 +2022,7 @@ msgstr "Generowanie sygnatury: %d\n"
msgid "Could not open %s: %s\n"
msgstr "Nie można otworzyć %s\n"
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Nie można zapisać pakietu: %s"
@@ -2050,7 +2052,7 @@ msgstr "Nie można odczytać ikony: %s"
msgid "Unable to write payload to %s: %s\n"
msgstr "Nie można zapisać pakietu: %s"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapisano: %s\n"
@@ -2497,11 +2499,11 @@ msgstr "otwiernie bazę danych w trybie 0x%x w %s\n"
msgid "cannot get %s lock on database\n"
msgstr "utworzenie blokady %s na bazie danych nie jest możliwe"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2530,12 +2532,12 @@ msgstr "usuwanie indeksu plików dla %s\n"
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "otwiernie bazę danych w trybie 0x%x w %s\n"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, fuzzy, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "utworzenie blokady %s na bazie danych nie jest możliwe"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, fuzzy, c-format
msgid "locked db index %s/%s\n"
msgstr "usuwanie indeksu plików dla %s\n"
@@ -2561,104 +2563,114 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+#, fuzzy
+msgid "NO "
+msgstr "NIE DOBRZE"
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
-#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
-msgstr ""
+#: lib/depends.c:1071
+#, fuzzy, c-format
+msgid "%s: %-45s %-s (cached)\n"
+msgstr "plik %s nie należy do żadnego pakietu\n"
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, fuzzy, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr "plik %s nie należy do żadnego pakietu\n"
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, fuzzy, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr "plik %s nie należy do żadnego pakietu\n"
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, fuzzy, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "plik %s nie należy do żadnego pakietu\n"
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, fuzzy, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "zależności pakietu %s nie zostały spełnione: %s\n"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "pakiet %s jest w konflikcie: %s\n"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, fuzzy, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr "usuwanie indeksu grupy\n"
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2672,8 +2684,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr "(nie jest liczbą)"
@@ -2715,32 +2727,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "linia %d: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "ostrzeżenie: %s zapisany jako %s"
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "nie można usunąć %s - katalog nie jest pusty"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "skasowanie katalogu %s nie powiodło się"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "otwarcie %s nie powiodło się\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "ostrzeżenie: %s utworzony jako %s"
@@ -2751,92 +2763,92 @@ msgstr "ostrzeżenie: %s utworzony jako %s"
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabData() RPM_STRING_TYPE licznik musi być 1.\n"
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr "Typ danych %d nie jest obsługiwany\n"
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "Błedny licznik dla headerAddEntry(): %d\n"
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr "brak { po %"
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr "brak } po %{"
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr "pusty format etykiety"
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr "pusta nazwa etykiety"
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr "nieznana etykieta"
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr "spodziewany ] na końcu tablicy"
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr "nie spodziewany ]"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr "nie spodziewany }"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr "spodziewany ? w wyrażeniu"
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr "spodziewany { po ? w wyrażeniu"
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr "spodziewany } w wyrażeniu"
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr "spodziewany : po podwyrażeniu ?"
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr "spodziewany { po : w wyrażeniu"
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr "spodziewany | na końcu wyrażenia"
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr "(nieznany typ)"
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "błąd w tworzeniu pliku tymczasowego %s"
@@ -2847,7 +2859,7 @@ msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"tylko pakiety z numerem głównym <= 3 są obsługiwane przez tą wersję RPM'a"
-#: lib/package.c:179
+#: lib/package.c:181
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
@@ -3091,247 +3103,246 @@ msgstr " jest wymagany przez %s-%s-%s\n"
msgid " conflicts with %s-%s-%s\n"
msgstr " jest w konflikcie z %s-%s-%s\n"
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "pakiet %s-%s-%s zbudowano dla innej architektury"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "pakiet %s-%s-%s jest już zainstalowany"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
"plik %s z pakietu %s-%s-%s jest w konflikcie z plikiem z pakietu %s-%s-%s"
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
"pakiet %s-%s-%s (który jest nowszy niż %s-%s-%s) jest już zainstalowany"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, fuzzy, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s"
-#: lib/problems.c:141
+#: lib/problems.c:160
#, fuzzy, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s"
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, fuzzy, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "wystąpił nieznany błąd %d w trakcie manipulowania pakietem %s-%s-%s"
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "nie można utworzyć %s"
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "nie można zapisać do %s"
-#: lib/psm.c:604
+#: lib/psm.c:605
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "spodziewany pakiet źródłowy a nie binarny"
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "pakiet źródłowy nie zawiera pliku .spec"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "wykonanie skryptu nie powiodło się"
-#: lib/psm.c:961
+#: lib/psm.c:962
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "wykonanie skryptu nie powiodło się"
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "pakiet: %s-%s-%s test plików = %d\n"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, fuzzy, c-format
msgid "user %s does not exist - using root\n"
msgstr "użytkownik %s nie istnieje - użyto konta root"
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "grupa %s nie istnieje - użyto grupy root"
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozpakowanie archiwum nie powiodło się %s%s: %s"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr " na pliku "
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "uruchamianie skryptu postinstall (jeśli istnieje)\n"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "błąd w formacie: %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr "(nie zawiera plików)"
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr "normalny "
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr "zastąpiony "
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr "niezainstalowany"
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr "udostępniony w sieci"
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr "(nieznany %3d)"
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr "(brak statusu)"
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "pakiet nie ma ani właściciela pliku ani list id"
-#: lib/query.c:438
+#: lib/query.c:392
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "nie można odwiązać %s: %s\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otwarcie %s nie powiodło się\n"
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr "pakiety w starym formacie nie mogą być odpytywane\n"
-
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
-msgstr "%s nie wygląda na pakiet RPM\n"
-
-#: lib/query.c:590
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr "odpytywanie %s nie powiodło się\n"
-#: lib/query.c:624
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
+msgstr "pakiety w starym formacie nie mogą być odpytywane\n"
+
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: readLead nie powiodło się\n"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "odpytywanie pliku spec %s nie powiodło się, nie można interpretować\n"
-#: lib/query.c:647
+#: lib/query.c:622
#, fuzzy
msgid "no packages\n"
msgstr "znaleziono %d pakietów\n"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupa %s nie zawiera żadnych pakietów\n"
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr "żaden pakiet nie zahacza %s\n"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr "żaden pakiet nie wymaga %s\n"
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr "żaden pakiet nie udostępnia %s\n"
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr "plik %s: %s\n"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "plik %s nie należy do żadnego pakietu\n"
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "błędny numer pakietu: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "numer rekordu pakietu: %d\n"
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr "nie można odczytać rekordu %d\n"
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
@@ -3573,118 +3584,95 @@ 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:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "nie podano nazw plików do zainstalowania"
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr "zliczanie pakietów do zainstalowania\n"
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr "znaleziono %d pakietów\n"
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr "szukanie pakietów do ściągnięcia\n"
-
-#: lib/rpminstall.c:234
-#, fuzzy, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "%s pomijany - transmisja %s nie powiodła się\n"
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, 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:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr "... jako %s\n"
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s pomijany - transmisja %s nie powiodła się\n"
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr "ściągnięto %d pakietów\n"
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, fuzzy, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "nie można otworzyć pliku %s: %s"
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr "%s nie może być zainstalowany\n"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nie można otworzyć %s/packages.rpm\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr "błąd czytania z pliku %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "plik %s wymaga nowszej wersji RPM\n"
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr "%s nie może być zainstalowany\n"
+
+#: lib/rpminstall.c:472
#, 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:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "niespełnione zależności:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr "instalacja pakietów binarnych\n"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, fuzzy, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "nie można otworzyć pliku %s: %s"
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "nie można otworzyć %s/packages.rpm\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" określa wiele pakietów\n"
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "usunięcie tych pakietów zerwie zależności:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie można otworzyć %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "Instalacja %s\n"
@@ -3922,50 +3910,50 @@ msgstr "Musisz ustawić \"%%_gpg_name\" w pliku swego makra"
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Musisz ustawić \"%%_pgp_name\" w pliku swego makra"
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "Ten OS nie jest wspierany: %s"
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "przesuwanie %s do %s\n"
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "wyłączanie %s\n"
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "wyłączanie %s\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr "przesuwanie %s do %s\n"
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "przesuwanie %s do %s\n"
-#: lib/transaction.c:617
-#, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "tworzenie katalogu: %s\n"
-
-#: lib/transaction.c:741
+#: lib/transaction.c:771
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s pominięty z powodu flagi missingok\n"
+#: lib/transaction.c:1359
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "tworzenie katalogu: %s\n"
+
#: lib/verify.c:61
msgid "don't verify files in package"
msgstr "nie sprawdzaj plików pakietu"
@@ -3975,26 +3963,26 @@ msgstr "nie sprawdzaj plików pakietu"
msgid "do not execute %verifyscript (if any)"
msgstr "nie wykonuj żadnych etapów"
-#: lib/verify.c:253
+#: lib/verify.c:257
#, fuzzy
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
"pakiet nie specyfikuje ani nazwy użytkownika ani list id (to nie powinno się "
"zdarzyć)"
-#: lib/verify.c:271
+#: lib/verify.c:275
#, fuzzy
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
"pakiet nie specyfikuje ani nazwy grupy ani list id (to nie powinno się "
"zdarzyć)"
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "brak %s\n"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Niespełnione zależności dla %s-%s-%s: "
@@ -4210,6 +4198,31 @@ msgstr "port musi być liczbą\n"
msgid "failed to create %s: %s\n"
msgstr "utworzenie %s nie powiodło się\n"
+#~ msgid " --timecheck <secs> "
+#~ msgstr " --timecheck <sekundy>"
+
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "ustaw sprawdzanie czasu do ilości <sekund> (0 wyłącza)"
+
+#~ msgid "%s does not appear to be a RPM package\n"
+#~ msgstr "%s nie wygląda na pakiet RPM\n"
+
+#~ msgid "counting packages to install\n"
+#~ msgstr "zliczanie pakietów do zainstalowania\n"
+
+#~ msgid "found %d packages\n"
+#~ msgstr "znaleziono %d pakietów\n"
+
+#~ msgid "looking for packages to download\n"
+#~ msgstr "szukanie pakietów do ściągnięcia\n"
+
+#, fuzzy
+#~ msgid "skipping %s - rpmGlob failed(%d)\n"
+#~ msgstr "%s pomijany - transmisja %s nie powiodła się\n"
+
+#~ msgid "retrieved %d packages\n"
+#~ msgstr "ściągnięto %d pakietów\n"
+
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
@@ -4593,10 +4606,6 @@ msgstr "utworzenie %s nie powiodło się\n"
#~ " rpm {--recompile} [--rcfile <plik>] [-v] źródłowy1.rpm ... "
#~ "źródłowyN.rpm"
-#, fuzzy
-#~ msgid " -K <pkg>+ "
-#~ msgstr " --resign <pakiet>+ "
-
#~ msgid "line %d: Version not permitted: %s"
#~ msgstr "linia %d: Wersja niedozwolona: %s"
diff --git a/po/pt.po b/po/pt.po
index 340f97904..d367024e5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\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"
@@ -372,11 +372,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -392,7 +392,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -643,6 +643,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -734,353 +738,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1464,6 +1460,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1852,7 +1852,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "năo consigo abrir ficheiro spec %s: %s\n"
@@ -1882,7 +1882,7 @@ msgstr "năo consigo abrir ficheiro spec %s: %s\n"
msgid "Unable to write payload to %s: %s\n"
msgstr "năo consigo abrir ficheiro spec %s: %s\n"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2304,11 +2304,11 @@ msgstr ""
"năo consegui abrir %s/packages.rpm\n"
"\n"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2337,12 +2337,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2368,104 +2368,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2479,8 +2488,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2522,32 +2531,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "năo consigo abrir ficheiro spec %s: %s\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "năo consigo abrir ficheiro spec %s: %s\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2557,92 +2566,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2651,7 +2660,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2870,245 +2879,244 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr ""
"năo consegui abrir %s/packages.rpm\n"
"\n"
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr ""
"năo consegui abrir %s/packages.rpm\n"
"\n"
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-
-#: lib/query.c:585 lib/rpminstall.c:320
+#: lib/query.c:525
#, c-format
-msgid "%s does not appear to be a RPM package\n"
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:590
-#, c-format
-msgid "query of %s failed\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "năo consigo abrir ficheiro spec %s: %s\n"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3348,119 +3356,96 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
"năo consegui abrir %s/packages.rpm\n"
"\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3685,48 +3670,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3737,20 +3722,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c34162b5a..5c8c47e40 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
# Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
#
msgid ""
-msgstr "POT-Creation-Date: 2001-03-16 11:04-0500\n"
+msgstr "POT-Creation-Date: 2001-04-23 16:53-0400\n"
# , c-format
#: build.c:31
@@ -437,12 +437,12 @@ msgstr "número da porta do servidor ftp (ou proxy)"
msgid "query mode"
msgstr "modo pesquisa"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "use <diretório> como diretório para o banco de dados"
@@ -459,7 +459,7 @@ msgstr "use s como formato do cabeçalho (implica -i)"
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "use <diretório> como diretório raiz"
@@ -732,6 +732,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " -b<estágio> <spec> "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "apague (desinstale) pacote"
@@ -832,21 +837,11 @@ msgstr ""
msgid "do not execute any stages"
msgstr "năo execute nenhum estágio"
-#: rpm.c:534
-#, fuzzy
-msgid " --timecheck <secs> "
-msgstr " -b<estágio> <spec> "
-
#: rpm.c:535
-#, fuzzy
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "atribua S segundos ao tempo de checagem (0 o desabilita)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -854,68 +849,68 @@ msgstr ""
"instale pacote fonte, construa pacote binário e remova o arquivo spec, "
"fontes, patches e ícones."
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "como --rebuild, mas năo construa nenhum pacote"
-#: rpm.c:543
+#: rpm.c:541
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<estágio> <spec> "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "assine um pacote (descarte a assinatura corrente)"
-#: rpm.c:545
+#: rpm.c:543
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<estágio> <spec> "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "adicione uma assinatura a um pacote"
-#: rpm.c:547
+#: rpm.c:545
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<estágio> <spec> "
-#: rpm.c:548
+#: rpm.c:546
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<estágio> <spec> "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "verifique a assinatura do pacote"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "desconsidere quaisquer assinaturas PGP"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
#, fuzzy
msgid "skip any GPG signatures"
msgstr "desconsidere quaisquer assinaturas PGP"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "desconsidere quaisquer assinaturas MD5"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "certifique que um banco de dados válido existe"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -923,7 +918,7 @@ msgstr ""
"atribua as permissőes dos arquivos para aquelas no banco de dados de pacotes "
"usando as mesmas opçőes de especificaçăo de pacote do -q"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -931,166 +926,166 @@ msgstr ""
"atribua dono e grupo dos arquivos para aquelas no banco de dados de pacotes "
"usando as mesmas opçőes de especificaçăo de pacote do -q"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "somente um modo principal pode ser especificado"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u e --uninstall foram descontinuados e năo funcionam mais.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Use -e ou --erase no lugar.\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
#, fuzzy
msgid "relocations must begin with a /"
msgstr "argumentos para o --dbpath devem começar com uma /"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "argumentos para o --dbpath devem começar com uma /"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "um tipo de pesquisa/verificaçăo pode ser feita por vez"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
#, fuzzy
msgid "unexpected query flags"
msgstr "fonte de pesquisa năo esperado"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
#, fuzzy
msgid "unexpected query format"
msgstr "fonte de pesquisa năo esperado"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "fonte de pesquisa năo esperado"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "somente instalaçăo e atualizaçăo podem ser forçadas"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
#, fuzzy
msgid "files may only be relocated during package installation"
msgstr "--percent somente pode ser especificado durante instalaçőes de pacotes"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
#, fuzzy
msgid "only one of --prefix or --relocate may be used"
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--prefix somente pode ser usada quando se está instalando novos pacotes"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
"--prefix somente pode ser usada quando se está instalando novos pacotes"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "argumentos para --prefix devem começar com uma /"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
"--hash (-h) somente podem ser especificado durante instalaçőes de pacotes"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaçőes de pacotes"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaçőes de pacotes"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs somente pode ser especificado durante instalaçőes de pacotes"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
"--excludedocs somente pode ser especificado durante instalaçőes de pacotes"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
"--includedocs somente pode ser especificado durante instalaçőes de pacotes"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
"--ignorearch somente pode ser especificado durante instalaçőes de pacotes"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
"--ignoreos somente pode ser especificado durante instalaçőes de pacotes"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr ""
"--ignoreos somente pode ser especificado durante instalaçőes de pacotes"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--allmatches somente pode ser especificado durante desinstalaçőes de pacotes"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
#, fuzzy
msgid "--allfiles may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaçőes de pacotes"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
#, fuzzy
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--test somente pode ser especificado durante [des]instalaçőes e construçőes "
"de pacotes"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
@@ -1099,12 +1094,12 @@ msgstr ""
"--noscripts somente pode ser especificado durante [des]instalaçőes e "
"verificaçőes de pacotes"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaçőes de pacotes"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -1113,7 +1108,7 @@ msgstr ""
"--test somente pode ser especificado durante [des]instalaçőes e construçőes "
"de pacotes"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1122,7 +1117,7 @@ msgstr ""
"--nodeps somente pode ser especificado durante [des]instalaçőes e "
"verificaçőes de pacotes"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -1130,7 +1125,7 @@ msgstr ""
"--test somente pode ser especificado durante [des]instalaçőes e construçőes "
"de pacotes"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1138,24 +1133,24 @@ msgstr ""
"--root (-r) somente pode ser especificado durante [des]instalaçőes, "
"pesquisas e reconstruçăo de bancos de dados"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumentos para --root (-r) devem começar com uma /"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage somente pode ser usado durante a atualizaçăo de pacotes"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp somente pode ser usado durante checagem de assinaturas"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nopgp somente pode ser usado durante checagem de assinaturas"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
@@ -1163,79 +1158,79 @@ msgstr ""
"--nopgp somente pode ser usado durante checagem de assinaturas e verificaçăo "
"de pacotes"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
#, fuzzy
msgid "pgp not found: "
msgstr "năo foi passado pacote para desinstalaçăo"
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "Checagem de pass phrase falhou\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "Pass phrase ok.\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign somente pode ser usado durante a construçăo de pacotes"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
#, fuzzy
msgid "exec failed\n"
msgstr "Construçăo falhou.\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "argumentos năo esperados em --querytags"
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "nenhum pacote informado para checagem de assinatura"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "năo foram passados pacotes para assinatura"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "năo foi passado pacote para desinstalaçăo"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "năo foi passado pacote para instalaçăo"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "năo foi passado argumento para pesquisa"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "năo foi passado argumento para verificaçăo"
@@ -1680,6 +1675,11 @@ msgstr " -b<estágio> <spec> "
msgid " --erase <package>"
msgstr "instale pacote"
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " -b<estágio> <spec> "
+
#: rpmqv.c:660
#, fuzzy
msgid " --resign <pkg>+ "
@@ -2114,7 +2114,7 @@ msgid "Could not open %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
# , c-format
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Năo consegui abrir: %s\n"
@@ -2149,7 +2149,7 @@ msgstr "Năo consegui abrir: %s\n"
msgid "Unable to write payload to %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2628,11 +2628,11 @@ msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
msgid "cannot get %s lock on database\n"
msgstr "năo foi passado pacote para desinstalaçăo"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2661,12 +2661,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, fuzzy, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "năo foi passado pacote para desinstalaçăo"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2692,104 +2692,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, fuzzy, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "năo foi passado pacote para instalaçăo"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "năo foi passado pacote para desinstalaçăo"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2803,8 +2812,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2850,35 +2859,35 @@ msgstr ""
msgid "%9d %s\n"
msgstr "Năo consegui ler o arquivo spec de %s\n"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
# , c-format
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "Năo consegui abrir: %s\n"
# , c-format
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "Construçăo falhou.\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "Construçăo falhou.\n"
# , c-format
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "Năo consegui abrir: %s\n"
@@ -2888,95 +2897,95 @@ msgstr "Năo consegui abrir: %s\n"
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
#, fuzzy
msgid "unexpected ]"
msgstr "fonte de pesquisa năo esperado"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
#, fuzzy
msgid "unexpected }"
msgstr "fonte de pesquisa năo esperado"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
# , c-format
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "Năo consegui abrir: %s\n"
@@ -2985,7 +2994,7 @@ msgstr "Năo consegui abrir: %s\n"
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -3237,248 +3246,248 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
# , c-format
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "Năo consegui abrir: %s\n"
# , c-format
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "Construçăo falhou.\n"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "năo execute nenhum estágio"
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
#, fuzzy
msgid "not installed "
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "năo foi passado pacote para instalaçăo"
# , c-format
-#: lib/query.c:438
+#: lib/query.c:392
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "Construçăo falhou.\n"
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-
-#: lib/query.c:585 lib/rpminstall.c:320
+#: lib/query.c:525
#, c-format
-msgid "%s does not appear to be a RPM package\n"
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:590
-#, c-format
-msgid "query of %s failed\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:624
+# , c-format
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "Năo consegui abrir: %s\n"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
#, fuzzy
msgid "no packages\n"
msgstr "pesquise todos os pacotes"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, fuzzy, c-format
msgid "no package triggers %s\n"
msgstr "năo foram passados pacotes para assinatura"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "năo foi passado pacote para instalaçăo"
@@ -3737,34 +3746,15 @@ msgstr "RPM versăo %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/rpminstall.c:210
-#, fuzzy
-msgid "counting packages to install\n"
-msgstr "năo foi passado pacote para instalaçăo"
-
-#: lib/rpminstall.c:214
-#, fuzzy, c-format
-msgid "found %d packages\n"
-msgstr "pesquise todos os pacotes"
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
# "Project-Id-Version: rpm-2.5.3\n"
# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
@@ -3773,97 +3763,92 @@ msgstr ""
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, 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:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-# , c-format
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, fuzzy, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "Năo consegui abrir: %s\n"
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, fuzzy, c-format
-msgid "%s cannot be installed\n"
-msgstr "năo foi passado pacote para instalaçăo"
-
# , c-format
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, fuzzy, c-format
+msgid "%s cannot be installed\n"
+msgstr "năo foi passado pacote para instalaçăo"
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
#, fuzzy
msgid "failed dependencies:\n"
msgstr "lista dependęncias do pacote"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
#, fuzzy
msgid "installing binary packages\n"
msgstr "instale pacote"
-#: lib/rpminstall.c:553
+# , c-format
+#: lib/rpminstall.c:526
+#, fuzzy, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "Năo consegui abrir: %s\n"
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
#, fuzzy
msgid "removing these packages would break dependencies:\n"
msgstr "lista dependęncias do pacote"
# , c-format
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -4106,7 +4091,7 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
@@ -4118,13 +4103,13 @@ msgstr ""
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "RPM versăo %s\n"
# , c-format
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "Năo consegui abrir: %s\n"
@@ -4137,7 +4122,7 @@ msgstr "Năo consegui abrir: %s\n"
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "RPM versăo %s\n"
@@ -4150,22 +4135,27 @@ msgstr "RPM versăo %s\n"
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "RPM versăo %s\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
# , c-format
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "Năo consegui abrir: %s\n"
+#: lib/transaction.c:771
+#, c-format
+msgid "%s skipped due to missingok flag\n"
+msgstr ""
+
# "Project-Id-Version: rpm-2.5.3\n"
# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
@@ -4174,16 +4164,11 @@ msgstr "Năo consegui abrir: %s\n"
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/transaction.c:617
+#: lib/transaction.c:1359
#, fuzzy, c-format
msgid "excluding directory %s\n"
msgstr "RPM versăo %s\n"
-#: lib/transaction.c:741
-#, c-format
-msgid "%s skipped due to missingok flag\n"
-msgstr ""
-
#: lib/verify.c:61
#, fuzzy
msgid "don't verify files in package"
@@ -4194,20 +4179,20 @@ msgstr "instale pacote"
msgid "do not execute %verifyscript (if any)"
msgstr "năo execute nenhum estágio"
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
@@ -4415,6 +4400,22 @@ msgid "failed to create %s: %s\n"
msgstr "Năo consegui abrir o pipe tar: %s\n"
#, fuzzy
+#~ msgid " --timecheck <secs> "
+#~ msgstr " -b<estágio> <spec> "
+
+#, fuzzy
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "atribua S segundos ao tempo de checagem (0 o desabilita)"
+
+#, fuzzy
+#~ msgid "counting packages to install\n"
+#~ msgstr "năo foi passado pacote para instalaçăo"
+
+#, fuzzy
+#~ msgid "found %d packages\n"
+#~ msgstr "pesquise todos os pacotes"
+
+#, fuzzy
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
@@ -4684,10 +4685,6 @@ msgstr "Năo consegui abrir o pipe tar: %s\n"
#~ " rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
#, fuzzy
-#~ msgid " -K <pkg>+ "
-#~ msgstr " -b<estágio> <spec> "
-
-#, fuzzy
#~ msgid " [--sign] [--nobuild] ]"
#~ msgstr ""
#~ " [--sign] [--test] [--timecheck <S>] arquivo-spec"
diff --git a/po/ro.po b/po/ro.po
index 2cc9a5eb4..cfc765875 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: 1999-04-10 12:00+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"
@@ -370,11 +370,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -390,7 +390,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -641,6 +641,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -732,353 +736,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1462,6 +1458,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1848,7 +1848,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1878,7 +1878,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2298,11 +2298,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2331,12 +2331,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2362,104 +2362,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2473,8 +2482,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2516,32 +2525,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2551,92 +2560,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2645,7 +2654,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2864,241 +2873,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3334,117 +3342,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3667,48 +3652,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3719,20 +3704,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 515203e89..c385d9a4c 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-04-18 16:40-0400\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -741,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -2387,6 +2379,14 @@ msgstr ""
msgid " %s A %s\tB %s\n"
msgstr ""
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
@@ -2399,7 +2399,7 @@ msgstr ""
#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
#: lib/depends.c:1090
@@ -2438,13 +2438,13 @@ msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1254
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1321
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
@@ -2461,7 +2461,8 @@ msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1731
-msgid "========== tsorting packages\n"
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
#: lib/depends.c:1778
@@ -2658,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -3037,7 +3038,7 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:320 lib/rpminstall.c:447
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -3051,7 +3052,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:556 lib/rpminstall.c:457
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr ""
@@ -3110,7 +3111,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:744 lib/rpminstall.c:592
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3354,19 +3355,19 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:271
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:281
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
@@ -3381,59 +3382,59 @@ msgstr ""
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:427
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:439 lib/rpminstall.c:660
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:486
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:579
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:618
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:647
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:653
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index f256e1db1..22c4e7b24 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: 2000-08-08 01:20+0300\n"
"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -394,11 +394,11 @@ msgstr "ÎĎÍĹŇ ĐĎŇÔÁ http-ÓĹŇ×ĹŇÁ (ÉĚÉ proxy)"
msgid "query mode"
msgstr "ŇĹÖÉÍ ÚÁĐŇĎÓÁ"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr " --dbpath <ËÁÔÁĚĎÇ> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ËÁÔÁĚĎÇ> ËÁË ËÁÔÁĚĎÇ ÄĚŃ ÂÁÚŮ ÄÁÎÎŮČ"
@@ -414,7 +414,7 @@ msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <qfmt> ËÁË ĆĎŇÍÁÔ ÚÁÇĎĚĎ×ËÁ (ĐĎÄŇÁÚŐÍĹ×ÁĹÔ -i)"
msgid " --root <dir> "
msgstr " --root <ËÁÔÁĚĎÇ> "
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ËÁÔÁĚĎÇ> ËÁË ËĎŇÎĹ×ĎĘ ËÁÔÁĚĎÇ"
@@ -673,6 +673,11 @@ msgstr ""
msgid " --erase <package>"
msgstr " --erase <ĐÁËĹÔ> "
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " -i <ĆÁĘĚ ĐÁËĹÔÁ> "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "ŐÄÁĚÉÔŘ (ÄĹÉÎÓÔÁĚĚÉŇĎ×ÁÔŘ) ĐÁËĹÔ"
@@ -767,19 +772,11 @@ msgstr "ÓĎÂŇÁÔŘ ĐÁËĹÔŮ ÄĚŃ ĂĹĚĹ×ŮČ ĐĚÁÔĆĎŇÍ ĐĚÁÔĆĎŇÍÁ1...ĐĚÁÔĆĎŇÍÁN"
msgid "do not execute any stages"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÎÉËÁËÉČ ÜÔÁĐĎ×"
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr " --timecheck <secs> "
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "ŐÓÔÁÎĎ×ÉÔŘ ĐŇĎ×ĹŇËŐ ×ŇĹÍĹÎÉ × <secs> ÓĹËŐÎÄ (0 ĎÔÍĹÎŃĹÔ ĹĹ)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <src_pkg> "
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -787,63 +784,63 @@ msgstr ""
"ŐÓÔÁÎĎ×ÉÔŘ ÉÓČĎÄÎŮĘ ĐÁËĹÔ, ÓĎÂŇÁÔŘ Ä×ĎÉŢÎŮĘ ĐÁËĹÔ É ŐÄÁĚÉÔŘ spec-ĆÁĘĚ, ĆÁĘĚŮ "
"Ó ÉÓČĎÄÎŮÍÉ ÔĹËÓÔÁÍÉ, ÚÁĐĚÁÔŮ É ĐÉËÔĎÇŇÁÍÍŮ."
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr " --recompile <src_pkg> "
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "ËÁË --rebuild, ÎĎ ÎĹ ÓĎÂÉŇÁĹÔ ÎÉËÁËÉČ ĐÁËĹÔĎ×"
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr " --resign <pkg>+ "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "ĐĎÄĐÉÓÁÔŘ ĐÁËĹÔ (ŐÄÁĚÉ× ÔĹËŐÝŐŔ ĐĎÄĐÉÓŘ)"
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr " --addsign <pkg>+ "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "ÄĎÂÁ×ÉÔŘ ĐĎÄĐÉÓŘ Ë ĐÁËĹÔŐ"
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr " --checksig <pkg>+"
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr " -K <ĐÁËĹÔ>+ "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ × ĐÁËĹÔĹ"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "ĐŇĎĐŐÓÔÉÔŘ ×ÓĹ PGP-ĐĎÄĐÉÓÉ"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr "ĐŇĎĐŐÓÔÉÔŘ ×ÓĹ GPG-ĐĎÄĐÉÓÉ"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "ĐŇĎĐŐÓÔÉÔŘ ×ÓĹ MD5-ĐĎÄĐÉÓÉ"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "ŐÂĹÄÉÔŘÓŃ, ŢÔĎ ÓŐÝĹÓÔ×ŐĹÔ ĐŇÁ×ÉĚŘÎÁŃ ÂÁÚÁ ÄÁÎÎŮČ"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "ĐĹŇĹÓÔŇĎÉÔŘ ÂÁÚŐ ÄÁÎÎŮČ ÉÚ ÓŐÝĹÓÔ×ŐŔÝĹĘ ÂÁÚŮ"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -851,7 +848,7 @@ msgstr ""
"ŐÓÔÁÎĎ×ÉÔŘ ĐŇÁ×Á ÄĎÓÔŐĐÁ ĆÁĘĚĎ× ÔÁËÉĹ ÖĹ, ËÁË × ÂÁÚĹ ÄÁÎÎŮČ ĐÁËĹÔÁ, "
"ÉÓĐĎĚŘÚŐŃ ÔĹ ÖĹ ĎĐĂÉÉ ÓĐĹĂÉĆÉËÁĂÉÉ ĐÁËĹÔÁ, ŢÔĎ É -q"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -859,149 +856,149 @@ msgstr ""
"ŐÓÔÁÎĎ×ÉÔŘ ČĎÚŃÉÎÁ É ÇŇŐĐĐŐ ĆÁĘĚĎ× ÔÁËÉĹ ÖĹ, ËÁË × ÂÁÚĹ ÄÁÎÎŮČ ĐÁËĹÔÁ, "
"ÉÓĐĎĚŘÚŐŃ ÔĹ ÖĹ ĎĐĂÉÉ ÓĐĹĂÉĆÉËÁĂÉÉ ĐÁËĹÔÁ, ŢÔĎ É -q"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĎÄÉÎ ÉÚ ĎÓÎĎ×ÎŮČ ŇĹÖÉÍĎ×"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "ĎĐĂÉÉ -u É --uninstall ŐÓÔÁŇĹĚÉ É ÂĎĚŘŰĹ ÎĹ ŇÁÂĎÔÁŔÔ.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "÷ÍĹÓÔĎ ÎÉČ ÉÓĐĎĚŘÚŐĘÔĹ -e ÉĚÉ --erase.\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÓĎÄĹŇÖÁÔŘ ="
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÉÍĹÔŘ / ĐĎÓĚĹ ="
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr "ÉÓËĚŔŢĹÎÉŃ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "÷ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ ĐŇÉ ĎÂŇÁÂĎÔËĹ ÁŇÇŐÍĹÎÔĎ× (%d) :-(\n"
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "ÚÁ ĎÄÉÎ ŇÁÚ ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚÎĹÎ ÔĎĚŘËĎ ĎÄÉÎ ÔÉĐ ĐŇĎ×ĹŇËÉ ÉĚÉ ÚÁĐŇĎÓÁ"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr "ÎĹĎÖÉÄÁÎÎŮĹ ĆĚÁÇÉ ÚÁĐŇĎÓÁ"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr "ÎĹĎÖÉÄÁÎÎŮĘ ĆĎŇÍÁÔ ÚÁĐŇĎÓÁ"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "ÎĹĎÖÉÄÁÎÎŮĘ ÉÓÔĎŢÎÉË ÚÁĐŇĎÓÁ"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"ĐŇÉÎŐÄÉÔĹĚŘÎŮÍÉ ÍĎÇŐÔ ÂŮÔŘ ÔĎĚŘËĎ ŐÓÔÁÎĎ×ËÁ, ĎÂÎĎ×ĚĹÎÉĹ, ŐÄÁĚĹÎÉĹ ÉÓČĎÄÎÉËĎ× "
"É spec-ĆÁĘĚÁ"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "ĆÁĘĚŮ ÍĎÇŐÔ ÂŮÔŘ ĐĹŇĹÍĹÝĹÎŮ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĎÄÎÁ ÉÚ ĎĐĂÉĘ --prefix ÉĚÉ --relocate"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"ĎĐĂÉÉ --relocate É --excludepath ÍĎÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ "
"ÎĎ×ŮČ ĐÁËĹÔĎ×"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "ĎĐĂÉŔ --prefix ÍĎÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÎĎ×ŮČ ĐÁËĹÔĎ×"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "ÁŇÇŐÍĹÎÔŮ ÄĚŃ --prefix ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "ĎĐĂÉŃ --hash (-h) ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "ĎĐĂÉŃ --percent ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "ĎĐĂÉŃ --replacefiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr "ĎĐĂÉŃ --replacepkgs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr "ĎĐĂÉŃ --excludedocs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr "ĎĐĂÉŃ --includedocs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĎÄÎÁ ÉÚ ĎĐĂÉĘ --excludedocs ÉĚÉ --includedocs"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr "ĎĐĂÉŃ --ignorearch ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr "ĎĐĂÉŃ --ignoreos ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr "ĎĐĂÉŃ --ignoresize ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr "ĎĐĂÉŃ --allmatches ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr "ĎĐĂÉŃ --allfiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"ĎĐĂÉŃ --justdb ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
@@ -1010,12 +1007,12 @@ msgstr ""
"ĎĐĂÉŃ --noscripts ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É "
"×ĹŇÉĆÉËÁĂÉÉ ĐÁËĹÔÁ"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "ĎĐĂÉŃ --allfiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -1024,7 +1021,7 @@ msgstr ""
"ĎĐĂÉŃ --notriggers ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ ŐÄÁĚĹÎÉÉ "
"ĐÁËĹÔÁ"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -1032,7 +1029,7 @@ msgstr ""
"ĎĐĂÉŃ --nodeps ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ, ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É "
"×ĹŇÉĆÉËÁĂÉÉ ĐÁËĹÔĎ×"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -1040,7 +1037,7 @@ msgstr ""
"ĎĐĂÉŃ --test ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É ÓÂĎŇËĹ "
"ĐÁËĹÔÁ"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1048,100 +1045,100 @@ msgstr ""
"ĎĐĂÉŃ --root (-r) ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ, "
"ÚÁĐŇĎÓÁČ ĐÁËĹÔÁ É ĐĹŇĹÓÔŇĎĹÎÉÉ ÂÁÚŮ ÄÁÎÎŮČ"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "ÁŇÇŐÍĹÎÔŮ ÄĚŃ --root (-r) ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
"ĎĐĂÉŃ --oldpackage ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ĎÂÎĎ×ĚĹÎÉÉ ĐÁËĹÔĎ×"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "ĎĐĂÉŃ --nopgp ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ĐŇĎ×ĹŇËĹ ĐĎÄĐÉÓÉ"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr "ĎĐĂÉŃ --nogpg ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ĐŇĎ×ĹŇËĹ ĐĎÄĐÉÓÉ"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
"ĎĐĂÉŃ --nomd5 ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ĐŇĎ×ĹŇËĹ ĐĎÄĐÉÓÉ É "
"×ĹŇÉĆÉËÁĂÉÉ ĐÁËĹÔÁ"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr "ÎĹÔ ĆÁĘĚĎ× ÄĚŃ ĐĎÄĐÉÓÉ\n"
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr "ÎĹÔ ÄĎÓÔŐĐÁ Ë ĆÁĘĚŐ %s\n"
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr "pgp ÎĹ ÎÁĘÄĹÎÁ: "
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr "÷×ĹÄÉÔĹ ËĚŔŢĹ×ŐŔ ĆŇÁÚŐ: "
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "îĹ×ĹŇÎÁŃ ËĚŔŢĹ×ÁŃ ĆŇÁÚÁ\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "ëĚŔŢĹ×ÁŃ ĆŇÁÚÁ ĐŇÉÎŃÔÁ.\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "îĹ×ĹŇÎÁŃ ÓĐĹĂÉĆÉËÁĂÉŃ %%_signature × ÍÁËŇĎĆÁĘĚĹ.\n"
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "ĎĐĂÉŃ --sign ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ ĐÁËĹÔĎ×"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr "ÚÁĐŐÓË ÎĹ ŐÄÁĚÓŃ\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "ÎĹĎÖÉÄÁÎÎŮĹ ÁŇÇŐÍĹÎÔŮ ÄĚŃ --querytags "
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐŇĎ×ĹŇËÉ ĐĎÄĐÉÓÉ"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐĎÄĐÉÓÉ"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÄÁĚĹÎÉŃ"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "× ÚÁĐŇĎÓĹ ËĎ ×ÓĹÍ ĐÁËĹÔÁÍ ÚÁÄÁÎŮ ĚÉŰÎÉĹ ÁŇÇŐÍĹÎÔŮ"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÚÁĐŇĎÓÁ"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr "× ÚÁĐŇĎÓĹ ×ĹŇÉĆÉËÁĂÉÉ ×ÓĹČ ĐÁËĹÔĎ× ÚÁÄÁÎŮ ĚÉŰÎÉĹ ÁŇÇŐÍĹÎÔŮ"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÄĚŃ ×ĹŇÉĆÉËÁĂÉÉ"
@@ -1551,6 +1548,11 @@ msgstr " -U <ĆÁĘĚ ĐÁËĹÔÁ> "
msgid " --erase <package>"
msgstr " --erase <ĐÁËĹÔ> "
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " -K <pkg>+ "
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr " --resign <pkg>+ "
@@ -1960,7 +1962,7 @@ msgstr "çĹÎĹŇÉŇŐĹÔÓŃ ĐĎÄĐÉÓŘ: %d\n"
msgid "Could not open %s: %s\n"
msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ĐÁËĹÔ: %s"
@@ -1990,7 +1992,7 @@ msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ĐÉËÔĎÇŇÁÍÍŐ %s: %s"
msgid "Unable to write payload to %s: %s\n"
msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ĐÁËĹÔ %s: %s"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr "úÁĐÉÓÁÎ: %s\n"
@@ -2438,11 +2440,11 @@ msgstr "ĎÔËŇŮ×ĹÔÓŃ ĆÁĘĚ %s ÂÁÚŮ ÄÁÎÎŮČ × ŇĹÖÉÍĹ 0x%x\n"
msgid "cannot get %s lock on database\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐĎĚŐŢÉÔŘ ÂĚĎËÉŇĎ×ËŐ %s ÂÁÚŮ ÄÁÎÎŮČ"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr "ÉÓËĚŔŢÉÔĹĚŘÎŮĘ"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr "ŇÁÚÄĹĚŃĹÍŮĘ"
@@ -2471,12 +2473,12 @@ msgstr "ÚÁËŇŮÔ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s\n"
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s %s mode=0x%x\n"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐĎĚŐŢÉÔŘ ÂĚĎËÉŇĎ×ËŐ %s ÎÁ %s/%s\n"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr "ÚÁÂĚĎËÉŇĎ×ÁÎ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s\n"
@@ -2503,7 +2505,7 @@ msgstr ""
"%s ÉÍĹĹÔ ÓĚÉŰËĎÍ ÍÁĚŐŔ ÉĚÉ ÓĚÉŰËĎÍ ÂĎĚŘŰŐŔ ×ĹĚÉŢÉÎŐ integer, ĐŇĎĐŐÝĹÎĎ\n"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2512,97 +2514,107 @@ msgstr ""
"ÄĚŃ ÚÁ×ÉÓÉÍĎÓÔÉ \"B\" ÎŐÖÎĎ ŐËÁÚÁÔŘ \"epoch\" (ÔÁË ÖĹ ËÁË ÄĚŃ \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+#, fuzzy
+msgid "NO "
+msgstr "îĺ Oë"
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr "%s: %-45s YES (added files)\n"
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr "%s: %-45s YES (added provide)\n"
-#: lib/depends.c:1073
-#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+#: lib/depends.c:1071
+#, fuzzy, c-format
+msgid "%s: %-45s %-s (cached)\n"
msgstr "%s: %-45s %-3s (cached)\n"
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr "%s: %-45s YES (rpmrc provides)\n"
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr "%s: %-45s YES (rpmlib provides)\n"
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr "%s: %-45s YES (db files)\n"
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr "%s: %-45s YES (db provides)\n"
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, fuzzy, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr "%s: %-45s YES (db files)\n"
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr "%s: %-45s NO\n"
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) ÄĎÂÁ×ĚĹÎĎ × ËĹŰ ÚÁ×ÉÓÉÍĎÓÔĹĘ\n"
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "ÔŇĹÂĎ×ÁÎÉŃ ĐÁËĹÔÁ %s-%s-%s ÎĹ ŐÄĎ×ĚĹÔ×ĎŇĹÎŮ: %s\n"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "ĐÁËĹÔ %s ËĎÎĆĚÉËÔŐĹÔ Ó: %s\n"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, fuzzy, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr "ŐÄÁĚŃĹÔÓŃ \"%s\" ÉÚ ÉÎÄĹËÓÁ %s.\n"
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2620,8 +2632,8 @@ msgstr ""
"âĎĚĹĹ ĐĎÄŇĎÂÎÁŃ ÉÎĆĎŇÍÁĂÉŃ ÄĎÓÔŐĐÎÁ ÎÁ http://www.rpm.org ÉĚÉ × ÓĐÉÓËĹ "
"ŇÁÓÓŮĚËÉ rpm-list@redhat.com\n"
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr "(ÎĹ ŢÉÓĚĎ)"
@@ -2663,32 +2675,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "ÓÔŇĎËÁ %d: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "×ÎÉÍÁÎÉĹ: %s ÓĎČŇÁÎĹÎ ËÁË %s"
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ŐÄÁĚÉÔŘ %s - ËÁÔÁĚĎÇ ÎĹ ĐŐÓÔ"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "ĎŰÉÂËÁ ŐÄÁĚĹÎÉŃ ËÁÔÁĚĎÇÁ %s: %s"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "×ÎÉÍÁÎÉĹ: %s ÓĎÚÄÁÎ ËÁË %s"
@@ -2699,92 +2711,92 @@ msgstr "×ÎÉÍÁÎÉĹ: %s ÓĎÚÄÁÎ ËÁË %s"
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabData() RPM_STRING_TYPE count must be 1.\n"
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr "ôÉĐ ÄÁÎÎŮČ %d ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ\n"
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "îĹ×ĹŇÎĎĹ ŢÉÓĚĎ ÄĚŃ headerAddEntry(): %d\n"
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"{\" ĐĎÓĚĹ \"%\""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"}\" ĐĎÓĚĹ \"%{\""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr "ĐŐÓÔĎĘ ĆĎŇÍÁÔ ÔÜÇÁ"
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr "ĐŐÓÔĎĹ ÉÍŃ ÔÜÇÁ"
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr "ÎĹÉÚ×ĹÓÔÎŮĘ ÔÜÇ"
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr "× ËĎÎĂĹ ÍÁÓÓÉ×Á ĎÖÉÄÁĚÁÓŘ \"]\""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"]\""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"}\""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚĎÓŘ \"?\""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \"{\""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚĎÓŘ \"}\""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \":\""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \":\" ĎÖÉÄÁĚĎÓŘ \"{\""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr "× ËĎÎĂĹ ×ŮŇÁÖĹÎÉŃ ĎÖÉÄÁĚÓŃ \"|\""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr "(ÎĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ)"
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "ĎŰÉÂËÁ ÓĎÚÄÁÎÉŃ ×ŇĹÍĹÎÎĎÇĎ ĆÁĘĚÁ %s"
@@ -2794,7 +2806,7 @@ msgstr "ĎŰÉÂËÁ ÓĎÚÄÁÎÉŃ ×ŇĹÍĹÎÎĎÇĎ ĆÁĘĚÁ %s"
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ĐÁËĹÔŮ ×ĹŇÓÉÉ 1 ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ ÜÔĎĘ ×ĹŇÓÉĹĘ RPM"
-#: lib/package.c:179
+#: lib/package.c:181
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
@@ -3035,244 +3047,243 @@ msgstr " ÎŐÖĹÎ ÄĚŃ %s-%s-%s\n"
msgid " conflicts with %s-%s-%s\n"
msgstr " ËĎÎĆĚÉËÔŐĹÔ Ó %s-%s-%s\n"
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "ĐÁËĹÔ %s-%s-%s - ÄĚŃ ÄŇŐÇĎĘ ÁŇČÉÔĹËÔŐŇŮ"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "ĐÁËĹÔ %s-%s-%s - ÄĚŃ ÄŇŐÇĎĘ ĎĐĹŇÁĂÉĎÎÎĎĘ ÓÉÓÔĹÍŮ"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "ĐÁËĹÔ %s-%s-%s ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "ĐÁËĹÔ %s - ÎĹ ĐĹŇĹÍĹÝÁĹÍŮĘ\n"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, fuzzy, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr "ËĎÎĆĚÉËÔ ĆÁĘĚÁ %s ĐŇÉ ĐĎĐŮÔËÁČ ŐÓÔÁÎĎ×ËÉ %s-%s-%s É %s-%s-%s"
-#: lib/problems.c:121
+#: lib/problems.c:140
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr "ĆÁĘĚ %s ÉÚ ĐÁËĹÔÁ %s-%s-%s ËĎÎĆĚÉËÔŐĹÔ Ó ĆÁĘĚĎÍ ÉÚ ĐÁËĹÔÁ %s-%s-%s"
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "ĐÁËĹÔ %s-%s-%s (ËĎÔĎŇŮĘ ÎĎ×ĹĹ, ŢĹÍ %s-%s-%s) ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, fuzzy, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "ÄĚŃ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ %s-%s-%s ÎŐÖÎĎ %ld%cb ÎÁ ĆÁĘĚĎ×ĎĘ ÓÉÓÔĹÍĹ %s"
-#: lib/problems.c:141
+#: lib/problems.c:160
#, fuzzy, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "ÄĚŃ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ %s-%s-%s ÎŐÖÎĎ %ld%cb ÎÁ ĆÁĘĚĎ×ĎĘ ÓÉÓÔĹÍĹ %s"
-#: lib/problems.c:146
+#: lib/problems.c:165
#, fuzzy, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "pre-transaction syscall(s) ĐÁËĹÔ %s-%s-%s: ÓÂĎĘ %s: %s"
-#: lib/problems.c:153
+#: lib/problems.c:172
#, fuzzy, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "ÎĹÉÚ×ĹÓÔÎÁŃ ĎŰÉÂËÁ %d ĐŇÉ ŇÁÂĎÔĹ Ó ĐÁËĹÔĎÍ %s-%s-%s"
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐÉÓÁÔŘ × %s"
-#: lib/psm.c:604
+#: lib/psm.c:605
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "ĎÂÎÁŇŐÖĹÎ Ä×ĎÉŢÎŮĘ ĐÁËĹÔ ×ÍĹÓÔĎ ĎÖÉÄÁĹÍĎÇĎ ÉÓČĎÄÎĎÇĎ"
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "ÉÓČĎÄÎŮĘ ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ĆÁĘĚÁ .spec"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "ĎŰÉÂËÁ ×ŮĐĎĚÎĹÎÉŃ ÓËŇÉĐÔÁ %s-%s-%s, ËĎÄ ×ĎÚ×ŇÁÔÁ %d"
-#: lib/psm.c:961
+#: lib/psm.c:962
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "ĎŰÉÂËÁ ×ŮĐĎĚÎĹÎÉŃ ÓËŇÉĐÔÁ %s-%s-%s, ËĎÄ ×ĎÚ×ŇÁÔÁ %d"
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "ĐÁËĹÔ: %s-%s-%s ĆÁĘĚĎ×; test = %d\n"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, fuzzy, c-format
msgid "user %s does not exist - using root\n"
msgstr "ĐĎĚŘÚĎ×ÁÔĹĚŘ %s ÎĹ ÓŐÝĹÓÔ×ŐĹÔ, ÉÓĐĎĚŘÚŐĹÔÓŃ root"
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "ÇŇŐĐĐÁ %s ÎĹ ÓŐÝĹÓÔ×ŐĹÔ, ÉÓĐĎĚŘÚŐĹÔÓŃ root"
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "ŇÁÓĐÁËĎ×ËÁ ÁŇČÉ×Á ÎĹ ŐÄÁĚÁÓŘ%s%s: %s"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr " ÎÁ ĆÁĘĚĹ "
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "×ŮĐĎĚÎŃĹÔÓŃ ÓËŇÉĐÔ postinstall (ĹÓĚÉ ĹÓÔŘ)\n"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "ĎŰÉÂËÁ × ĆĎŇÍÁÔĹ: %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr "(ÎĹ ÓĎÄĹŇÖÉÔ ĆÁĘĚĎ×)"
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr "ÎĎŇÍÁĚŘÎŮĘ "
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr "ÚÁÍĹÎĹÎÎŮĘ "
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr "ÎĹ ŐÓÔÁÎĎ×ĚĹÎ "
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr "ÓĹÔĹ×ĎĘ "
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr "(ÎĹÉÚ×. %3d) "
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr "(ÓĎÓÔ. ÎĹÔ) "
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ÓĐÉÓËĎ× ÎÉ ČĎÚŃĹ× ĆÁĘĚĎ×, ÎÉ ÉČ ID"
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÚÁĐŇĎÓÉÔŘ %s: %s\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr "ÚÁĐŇĎÓŮ Ë SRPM × ÓÔÁŇĎÍ ĆĎŇÍÁÔĹ ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ\n"
-
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
-msgstr "%s ÎĹ ĐĎČĎÖ ÎÁ ĐÁËĹÔ RPM...\n"
-
-#: lib/query.c:590
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr "ĎŰÉÂËÁ ÚÁĐŇĎÓÁ %s\n"
-#: lib/query.c:624
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
+msgstr "ÚÁĐŇĎÓŮ Ë SRPM × ÓÔÁŇĎÍ ĆĎŇÍÁÔĹ ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ\n"
+
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: ĎŰÉÂËÁ Fread: %s\n"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "ÚÁĐŇĎÓ ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ %s ÎĹ ŐÄÁĚÓŃ, ÎĹ×ĎÚÍĎÖÎĎ ŇÁÚĎÂŇÁÔŘ ĆÁĘĚ\n"
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr "ÎĹÔ ĐÁËĹÔĎ×\n"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "ÇŇŐĐĐÁ %s ÎĹ ÓĎÄĹŇÖÉÔ ÎÉËÁËÉČ ĐÁËĹÔĎ×\n"
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ×Ú×ĎÄÉÔ ÔŇÉÇÇĹŇ %s\n"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ÔŇĹÂŐĹÔ %s\n"
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ĐŇĹÄĎÓÔÁ×ĚŃĹÔ %s\n"
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr "ĆÁĘĚ %s: %s\n"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "ĆÁĘĚ %s ÎĹ ĐŇÉÎÁÄĚĹÖÉÔ ÎÉ ĎÄÎĎÍŐ ÉÚ ĐÁËĹÔĎ×\n"
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "ÎĹ×ĹŇÎŮĘ ÎĎÍĹŇ ĐÁËĹÔÁ: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr "ÎĎÍĹŇ ÚÁĐÉÓÉ ĐÁËĹÔÁ: %u\n"
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr "ÚÁĐÉÓŘ %d ÎĹ ŢÉÔÁĹÔÓŃ\n"
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n"
@@ -3513,118 +3524,95 @@ msgstr "ŐÄÁĚŃĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "ĎŰÉÂËÁ ŐÄÁĚĹÎÉŃ ËÁÔÁĚĎÇÁ %s: %s\n"
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ"
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr "ĐĎÄÓŢÉÔŮ×ÁŔÔÓŃ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ\n"
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr "ÎÁĘÄĹÎĎ %d ĐÁËĹÔĎ×\n"
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr "ÉÝŐÔÓŃ ĐÁËĹÔŮ ÄĚŃ ĐĎĚŐŢĹÎÉŃ ĐĎ ÓĹÔÉ\n"
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "%s ĐŇĎĐŐÓËÁĹÔÓŃ - ĎŰÉÂËÁ rpmGlob(%d)\n"
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr "úÁÇŇŐÖÁĹÔÓŃ %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr " ... ËÁË %s\n"
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ĐŇĎĐŐÓËÁĹÔÓŃ - ĎŰÉÂËÁ ĐĹŇĹÄÁŢÉ - %s\n"
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr "ĐĎĚŐŢĹÎĎ %d ĐÁËĹÔĎ×\n"
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ %s: %s\n"
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr "%s ÎĹ ÍĎÖĹÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎ\n"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ ÂÁÚŐ ÄÁÎÎŮČ Packages × %s\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr "ĐÁËĹÔ %s - ÎĹ ĐĹŇĹÍĹÝÁĹÍŮĘ\n"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÉÚ ĆÁĘĚÁ %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ÄĚŃ ĆÁĘĚÁ %s ÎĹĎÂČĎÄÉÍÁ ÂĎĚĹĹ ÎĎ×ÁŃ ×ĹŇÓÉŃ RPM\n"
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr "%s ÎĹ ÍĎÖĹÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎ\n"
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ÎÁĘÄĹÎĎ %d ÉÓČĎÄÎŮČ É %d ÂÉÎÁŇÎŮČ ĐÁËĹÔĎ×\n"
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁŔ ÂÉÎÁŇÎŮĹ ĐÁËĹÔŮ\n"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ %s: %s\n"
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "ĎŰÉÂËÁ ĎÔËŇŮÔÉŃ %s/packages.rpm\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ÚÁÄÁĹÔ ÎĹÓËĎĚŘËĎ ĐÁËĹÔĎ×\n"
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "ŐÄÁĚĹÎÉĹ ÜÔÉČ ĐÁËĹÔĎ× ÎÁŇŐŰÉÔ ÚÁ×ÉÓÉÍĎÓÔÉ:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "őÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ %s\n"
@@ -3865,50 +3853,50 @@ msgstr "÷Ů ÄĎĚÖÎŮ ŐÓÔÁÎĎ×ÉÔŘ \"%%_gpg_name\" × ×ÁŰĹÍ ÍÁËŇĎĆÁĘĚĹ"
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "÷Ů ÄĎĚÖÎŮ ŐÓÔÁÎĎ×ÉÔŘ \"%%_pgp_name\" × ×ÁŰĹÍ ÍÁËŇĎĆÁĘĚĹ"
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "ďó ÉÓËĚŔŢĹÎÁ: %s"
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n"
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "ÉÓËĚŔŢÁŔ ĆÁĘĚ %s%s\n"
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "ÉÓËĚŔŢÁŔ ĆÁĘĚ %s%s\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n"
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ ËÁÔÁĚĎÇ %s × %s\n"
-#: lib/transaction.c:617
-#, c-format
-msgid "excluding directory %s\n"
-msgstr "ÉÓËĚŔŢÁĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
-
-#: lib/transaction.c:741
+#: lib/transaction.c:771
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s ĐŇĎĐŐÝĹÎ ÉÚ-ÚÁ ĆĚÁÇÁ missingok\n"
+#: lib/transaction.c:1359
+#, c-format
+msgid "excluding directory %s\n"
+msgstr "ÉÓËĚŔŢÁĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
+
#: lib/verify.c:61
msgid "don't verify files in package"
msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĆÁĘĚŮ ĐÁËĹÔÁ"
@@ -3918,22 +3906,22 @@ msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĆÁĘĚŮ ĐÁËĹÔÁ"
msgid "do not execute %verifyscript (if any)"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÎÉËÁËÉČ ÜÔÁĐĎ×"
-#: lib/verify.c:253
+#: lib/verify.c:257
#, fuzzy
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr "× ĐÁËĹÔĹ ÎĹÔ ÎÉ ÉÍĹÎ ĐĎĚŘÚĎ×ÁÔĹĚĹĘ, ÎÉ ÉČ ID (ÔÁË ÎĹ ÄĎĚÖÎĎ ÂŮÔŘ)"
-#: lib/verify.c:271
+#: lib/verify.c:275
#, fuzzy
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr "× ĐÁËĹÔĹ ÎĹÔ ÎÉ ÉÍĹÎ ÇŇŐĐĐ, ÎÉ ÉČ ID (ÔÁË ÎĹ ÄĎĚÖÎĎ ÂŮÔŘ)"
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ %s\n"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "îĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ ÄĚŃ %s-%s-%s: "
@@ -4149,6 +4137,30 @@ msgstr "url ĐĎŇÔ ÄĎĚÖĹÎ ÂŮÔŘ ŢÉÓĚĎÍ\n"
msgid "failed to create %s: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
+#~ msgid " --timecheck <secs> "
+#~ msgstr " --timecheck <secs> "
+
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "ŐÓÔÁÎĎ×ÉÔŘ ĐŇĎ×ĹŇËŐ ×ŇĹÍĹÎÉ × <secs> ÓĹËŐÎÄ (0 ĎÔÍĹÎŃĹÔ ĹĹ)"
+
+#~ msgid "%s does not appear to be a RPM package\n"
+#~ msgstr "%s ÎĹ ĐĎČĎÖ ÎÁ ĐÁËĹÔ RPM...\n"
+
+#~ msgid "counting packages to install\n"
+#~ msgstr "ĐĎÄÓŢÉÔŮ×ÁŔÔÓŃ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ\n"
+
+#~ msgid "found %d packages\n"
+#~ msgstr "ÎÁĘÄĹÎĎ %d ĐÁËĹÔĎ×\n"
+
+#~ msgid "looking for packages to download\n"
+#~ msgstr "ÉÝŐÔÓŃ ĐÁËĹÔŮ ÄĚŃ ĐĎĚŐŢĹÎÉŃ ĐĎ ÓĹÔÉ\n"
+
+#~ msgid "skipping %s - rpmGlob failed(%d)\n"
+#~ msgstr "%s ĐŇĎĐŐÓËÁĹÔÓŃ - ĎŰÉÂËÁ rpmGlob(%d)\n"
+
+#~ msgid "retrieved %d packages\n"
+#~ msgstr "ĐĎĚŐŢĹÎĎ %d ĐÁËĹÔĎ×\n"
+
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
diff --git a/po/sk.po b/po/sk.po
index 729a8cabe..324f55f04 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: 1999-04-08 21:37+02:00\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -419,11 +419,11 @@ msgstr "číslo portu http servera (alebo proxy)"
msgid "query mode"
msgstr "režim otázok"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr " --dbpath <dir> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "použiť <adresár> ako adresár pre databázu"
@@ -440,7 +440,7 @@ msgstr "použiť <qfmt> ako hlavičkový formát (implikuje -i)"
msgid " --root <dir> "
msgstr " --root <dir> "
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "použiť <adresár> ako adresár najvyššej úrovne"
@@ -700,6 +700,11 @@ msgstr ""
msgid " --erase <package>"
msgstr " --erase <package>"
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " --resign <balík>+ "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "odinštalovať balík"
@@ -795,19 +800,11 @@ msgstr "vytvoriť balíky pre ciele platforma1...platformaN."
msgid "do not execute any stages"
msgstr "nevykonať žiadne etapy"
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr " --timecheck <sekúnd>"
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "nastaviť kontrolu času na <sekúnd> sekúnd (0 pre deaktiváciu)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <zdroj_balík>"
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -815,65 +812,65 @@ msgstr ""
"inštalovať zdrojový balík, vytvoriť binárny balík a odstrániť spec-súbor, "
"zdroje, záplaty a ikony"
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr " --recompile <src_pkg> "
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "ako --rebuild, ale nezostaviť žiadny balík"
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr " --resign <balík>+ "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "podpísať balík (zničiť aktuálny podpis)"
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr " --addsign <balík>+ "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "pridať podpis balíku"
-#: rpm.c:547
+#: rpm.c:545
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <balík>+ "
-#: rpm.c:548
+#: rpm.c:546
#, fuzzy
msgid " -K <pkg>+ "
msgstr " --resign <balík>+ "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "overiť podpis balíka"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "vynechať akékoľvek PGP podpisy"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr "vynechať akékoľvek GPG podpisy"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "vynechať akékoľvek MD5 podpisy"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "uistiť sa, že existuje platná databáza"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "znovu vytvoriť databázu z existujúcej"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -881,7 +878,7 @@ msgstr ""
"nastaviť prístupové práva súborov podľa údajov v databáze balíkov s použitím "
"rovnakých volieb špecifikácia balíka ako pre -q"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -889,148 +886,148 @@ msgstr ""
"nastaviť vlastníka a skupinu súborov podľa údajov v databáze balíkov s "
"použitím rovnakých volieb špecifikácia balíka ako pre -q"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "môže byť použitý iba jeden hlavný režim"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u a --uninstall sú zastaralé a už nefungujú.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Namiesto nich použite -e alebo --erase.\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "presunutia musia začínať znakom /"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "presunutia musia obsahovať znak ="
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "presunutia musia mať za znakom = znak /"
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr "vynechané cesty musia začínať znakom /"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "naraz môže byť vykonaný jeden typ otázky alebo overenia"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
#, fuzzy
msgid "unexpected query flags"
msgstr "neočakávaný zdroj pre otázku"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
#, fuzzy
msgid "unexpected query format"
msgstr "neočakávaný zdroj pre otázku"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "neočakávaný zdroj pre otázku"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "iba inštalácia, aktualizácia a odstránenie zdrojov môžu byť vynútené"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "súbory môžu byť presunuté iba počas inčtalácie balíka"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "može byť použitá iba jedna z volieb --prefix a --relocate"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate a --excludepath môžu byť použité iba počas inštalácie nových "
"balíkov"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix môže byť použitý iba počas inštalácie nových balíkov"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty pre --prefix musia začínať znakom /"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) môže byť použitý iba počas inštalácie balíka"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent môže byť použité iba počas inštalácie balíka"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles môže byť použité iba počas inštalácie balíka"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs môže byť použité iba počas inštalácie balíka"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs môže byť použité iba počas inštalácie balíka"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs môže byť použité iba počas inštalácie balíka"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "môže byť použitá iba jedna voľba z --excludedocs a --includedocs"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch môže byť použité iba počas inštalácie balíka"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos môže byť použité iba počas inštalácie balíka"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize môže byť použité iba počas inštalácie balíka"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches môže byť použité iba počas odstránenia balíkov"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles môže byť použité iba počas inštalácie balíka"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb môže byť použité iba počas inštalácie a odstránenia balíka"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
@@ -1039,19 +1036,19 @@ msgstr ""
"--noscripts môže byť použité iba počas inštalácie, odstránenia alebo "
"overenia balíka"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--allfiles môže byť použité iba počas inštalácie balíka"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb môže byť použité iba počas inštalácie a odstránenia balíka"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1060,7 +1057,7 @@ msgstr ""
"--nodeps môže byť použité iba počas inštalácie, odstránenia alebo overenia "
"balíka"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -1068,7 +1065,7 @@ msgstr ""
"--test môže byť použité iba počas inštalácie, odstránenia alebo zostavenia "
"balíka"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1076,98 +1073,98 @@ msgstr ""
"--root (-r) môže byť použité iba počas inštalácie a odstránenia balíka, "
"otázky alebo znovuzostavenia databázy"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty pre --root (-r) musia začínať znakom /"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage môže byť použíté iba počas aktualizácie"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp môže byť použíté iba počas overenia podpisu"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg môže byť použíté iba počas overenia podpisu"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nomd5 môže byť použíté iba počas overenia podpisu alebo balíka"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr "nie je možné pracovať so súborom %s\n"
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr "pgp nebolo nájdené: "
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "Kontrola hesla zlyhala\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "Heslo je v poriadku.\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Chybná špecifikácia %%_signature v makro-súbore.\n"
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign môže byť použíté iba počas zostavenia balíka"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr "vykonanie zlyhalo\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "neočakávané argumenty pre --querytags"
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "neboli zadané žiadne balíky pre overenie podpisu"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "neboli zadané žiadne balíky na podpis"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "neboli zadané žiadne balíky pre odinštalovanie"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "neboli zadané žiadne balíky pre inštaláciu"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "boli zadané nadbytočné argumenty otázky pre všetky balíky"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "neboli zadané žiadne argumenty pre otázku"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "boli zadané nadbytočné argumenty otázky pre všetky balíky"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "neboli zadané žiadne argumenty pre overenie"
@@ -1613,6 +1610,11 @@ msgstr " -U <súbor_balíka> "
msgid " --erase <package>"
msgstr " --erase <package>"
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " --resign <balík>+ "
+
#: rpmqv.c:660
#, fuzzy
msgid " --resign <pkg>+ "
@@ -2026,7 +2028,7 @@ msgstr "Vytvára sa PGP podpis: %d\n"
msgid "Could not open %s: %s\n"
msgstr "Otvorenie %s zlyhalo\n"
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Nie je možné zapísať balík: %s"
@@ -2056,7 +2058,7 @@ msgstr "Nie je možné prečítať ikonu: %s"
msgid "Unable to write payload to %s: %s\n"
msgstr "Nie je možné zapísať balík: %s"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapísané: %s\n"
@@ -2502,11 +2504,11 @@ msgstr "otvára sa databáza s právami 0x%x v %s\n"
msgid "cannot get %s lock on database\n"
msgstr "nie je možné získať %s zámok pre databázu"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr "výhradný"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr "zdieľaný"
@@ -2535,12 +2537,12 @@ msgstr "odstraňuje sa index súborov pre %s\n"
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "otvára sa databáza s právami 0x%x v %s\n"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, fuzzy, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "nie je možné získať %s zámok pre databázu"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, fuzzy, c-format
msgid "locked db index %s/%s\n"
msgstr "odstraňuje sa index súborov pre %s\n"
@@ -2566,104 +2568,114 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+#, fuzzy
+msgid "NO "
+msgstr "NIE JE V PORIADKU"
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
-#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
-msgstr ""
+#: lib/depends.c:1071
+#, fuzzy, c-format
+msgid "%s: %-45s %-s (cached)\n"
+msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, fuzzy, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, fuzzy, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, fuzzy, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, fuzzy, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "požiadavka balíka %s nie je uspokojená: %s\n"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "balík %s koliduje: %s\n"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, fuzzy, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr "odstraňuje sa index skupín\n"
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2677,8 +2689,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr "(nie je číslo)"
@@ -2720,32 +2732,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "riadok %d: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "varovanie: %s uchovaný ako %s"
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "nie je možné odstrániť %s - adresár nie je prázdny"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "rmdir %s zlyhalo: %s"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "otvorenie %s zlyhalo\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "varovanie: %s vytvorené ako %s"
@@ -2756,92 +2768,92 @@ msgstr "varovanie: %s vytvorené ako %s"
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabData() RPM_STRING_TYPE počet musí byť 1.\n"
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr "Typ údajov %d nie je podorovaný\n"
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "Chybný počet pre headerAddEntry(): %d\n"
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr "chýbajúce { po %"
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr "chýbajúce } po %{"
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr "prázdny tag formát"
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr "prázdne meno tagu"
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr "neznámy tag"
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr "] očakávané na konci poľa"
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr "neočakávané ]"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr "neočakávané }"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr "? očakávané vo výraze"
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr "{ očakávané po ? vo výraze"
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr "} očakávané vo výraze"
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ": očakávané po ? podvýraze"
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr "{ očakávané po : vo výraze"
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr "| očakávené na konci výrazu"
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr "(neznámy typ)"
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "chyba pri vytváraní dočasného súboru %s"
@@ -2851,7 +2863,7 @@ msgstr "chyba pri vytváraní dočasného súboru %s"
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "táto verzia RPM podporuje iba balíky s hlavným číslom <= 3"
-#: lib/package.c:179
+#: lib/package.c:181
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
@@ -3096,245 +3108,244 @@ msgstr " je vyžadované %s-%s-%s\n"
msgid " conflicts with %s-%s-%s\n"
msgstr " koliduje s %s-%s-%s\n"
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "balík %s nie je nainštalovaný\n"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "balík %s nie je nainštalovaný\n"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "balík %s nie je nainštalovaný\n"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "balík %s nie je nainštalovaný\n"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "nie je možné zapísať do %s: "
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "nie je možné zapísať do %s: "
-#: lib/psm.c:604
+#: lib/psm.c:605
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "očakávaný zdrojový balík, nájdený binárny"
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "zdrojový balík neobsahuje žiadny .spec súbor"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "vykonanie skriptu zlyhalo"
-#: lib/psm.c:961
+#: lib/psm.c:962
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "vykonanie skriptu zlyhalo"
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "balík: %s-%s-%s test súborov = %d\n"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, fuzzy, c-format
msgid "user %s does not exist - using root\n"
msgstr "používateľ %s neexistuje - použije sa root"
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "skupina %s neexistuje - použije sa root"
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozbalenie archívu zlyhalo%s%s: %s"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr " pre súbor "
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "vykonávajú sa poinštalačné skripty (ak existujú)\n"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "chyba formátu: %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr "(neobsahuje žiadne súbory)"
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr "normálny "
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr "nahradený "
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr "neinštalovaný "
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr "zdieľaný "
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr "(neznámy %d) "
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr "(žiadny stav) "
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií"
-#: lib/query.c:438
+#: lib/query.c:392
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "zmazanie %s zlyhalo: %s\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "otvorenie %s zlyhalo\n"
-#: lib/query.c:576
-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:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
-msgstr "%s zrejme nie je RPM balík\n"
-
-#: lib/query.c:590
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr "otázka na %s zlyhala\n"
-#: lib/query.c:624
+#: lib/query.c:531
+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:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: readLead zlyhalo\n"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "otázka na spec-súbor %s zlyhala, nie je možné analyzovať\n"
-#: lib/query.c:647
+#: lib/query.c:622
#, fuzzy
msgid "no packages\n"
msgstr "nájdených %d balíkov\n"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s neobsahuje žiadne balíky\n"
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr "žiadny z balíkov nespúšťa %s\n"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr "žiadny z balíkov nevyžaduje %s\n"
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr "žiadny z balíkov neposkytuje %s\n"
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr "súbor %s: %s\n"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "chybné číslo balíku: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "požaduje sa záznam číslo %d\n"
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr "záznam %d nie je možné prečítať\n"
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr "balík %s nie je nainštalovaný\n"
@@ -3576,118 +3587,95 @@ 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:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "neboli zadané žiadne balíky pre inštaláciu"
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr "počítajú sa balíky pre inštaláciu\n"
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr "nájdených %d balíkov\n"
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr "hľadajú sa balíky, ktoré treba preniesť\n"
-
-#: lib/rpminstall.c:234
-#, fuzzy, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "%s vynechané - prenos zlyhal - %s\n"
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, 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:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr "... ako %s\n"
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s vynechané - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr "prenieslo sa %d balíkov\n"
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, fuzzy, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "nie je možné otvoriť súbor %s: %s"
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr "%s nie je možné nainštalovať\n"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nie je možné otvoriť %s/packages.rpm\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "balík %s nie je nainštalovaný\n"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pri vytváraní dočasného súboru %s"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr "%s nie je možné nainštalovať\n"
+
+#: lib/rpminstall.c:472
#, 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:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "nevyriešené závislosti:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr "inštalujú sa binárne balíky\n"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, fuzzy, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "nie je možné otvoriť súbor %s: %s"
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "nie je možné otvoriť %s/packages.rpm\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" špecifikuje viac balíkov\n"
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "odstránenie týchto balíkov by porušilo závislosti:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie je možné otvoriť %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "Inštaluje sa %s\n"
@@ -3925,50 +3913,50 @@ msgstr "Musíte nastaviť \"%%gpg_name\" vo vašom makro-súbore"
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Musíte nastaviť \"%%pgp_name\" vo vašom makro-súbore"
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "OS je vynechaný: %s"
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "presúva sa %s do %s\n"
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "vynecháva sa %s\n"
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "vynecháva sa %s\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr "presúva sa %s do %s\n"
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "presúva sa %s do %s\n"
-#: lib/transaction.c:617
-#, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "vytvára sa adresár %s\n"
-
-#: lib/transaction.c:741
+#: lib/transaction.c:771
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s vynechané kvôli príznaku missingok\n"
+#: lib/transaction.c:1359
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "vytvára sa adresár %s\n"
+
#: lib/verify.c:61
#, fuzzy
msgid "don't verify files in package"
@@ -3979,26 +3967,26 @@ msgstr "zobraziť súbory v balíku"
msgid "do not execute %verifyscript (if any)"
msgstr "nevykonať žiadne etapy"
-#: lib/verify.c:253
+#: lib/verify.c:257
#, fuzzy
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
"v balíku chýba tak meno používateľa, ako aj zoznamy identifikácií (nemalo by "
"sa nikdy stať)"
-#: lib/verify.c:271
+#: lib/verify.c:275
#, fuzzy
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
"v balíku chýba tak meno skupiny, ako aj zoznamy identifikácií (nemalo by sa "
"nikdy stať)"
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "chýbajúce %s\n"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Nevyriešené závislosti pre %s-%s-%s: "
@@ -4213,6 +4201,31 @@ msgstr "url port musí byť číslo\n"
msgid "failed to create %s: %s\n"
msgstr "nepodarilo sa vytvoriť %s\n"
+#~ msgid " --timecheck <secs> "
+#~ msgstr " --timecheck <sekúnd>"
+
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "nastaviť kontrolu času na <sekúnd> sekúnd (0 pre deaktiváciu)"
+
+#~ msgid "%s does not appear to be a RPM package\n"
+#~ msgstr "%s zrejme nie je RPM balík\n"
+
+#~ msgid "counting packages to install\n"
+#~ msgstr "počítajú sa balíky pre inštaláciu\n"
+
+#~ msgid "found %d packages\n"
+#~ msgstr "nájdených %d balíkov\n"
+
+#~ msgid "looking for packages to download\n"
+#~ msgstr "hľadajú sa balíky, ktoré treba preniesť\n"
+
+#, fuzzy
+#~ msgid "skipping %s - rpmGlob failed(%d)\n"
+#~ msgstr "%s vynechané - prenos zlyhal - %s\n"
+
+#~ msgid "retrieved %d packages\n"
+#~ msgstr "prenieslo sa %d balíkov\n"
+
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
@@ -4606,10 +4619,6 @@ msgstr "nepodarilo sa vytvoriť %s\n"
#~ " rpm {--recompile} [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
#, fuzzy
-#~ msgid " -K <pkg>+ "
-#~ msgstr " --resign <balík>+ "
-
-#, fuzzy
#~ msgid "line %d: Version not permitted: %s"
#~ msgstr "riadok %d: V %s sú vyžadované verzie: %s"
diff --git a/po/sl.po b/po/sl.po
index 97b4e4be8..dc5f4167b 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.146 2001/03/22 23:39:08 jbj Exp $
+# $Id: sl.po,v 1.147 2001/04/23 20:57:03 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: 2000-10-08 19:05+0200\n"
"Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -412,11 +412,11 @@ msgstr "številka vrat za HTTP na strežniku ali posredniku"
msgid "query mode"
msgstr "poizvedbeni način"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr " --dbpath <imenik> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "kot imenik za podatkovno zbirko uporabi <imenik>"
@@ -433,7 +433,7 @@ msgstr "uporabi <qfmt> kot obliko glave (nanaša se na --info)"
msgid " --root <dir> "
msgstr " --root <imenik> "
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "uporabi <imenik> za korenski imenik"
@@ -690,6 +690,11 @@ msgstr ""
msgid " --erase <package>"
msgstr " --erase <paket> "
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " --resign <paket>+ "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "izbriši (odstrani) paket"
@@ -786,19 +791,11 @@ msgstr "izgradi pakete za navedena ciljna strojna okolja"
msgid "do not execute any stages"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr " --timecheck <sek> "
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "največji dopustni čas izgradnje paketa (0 brez omejitev)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <izv.paket> "
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -806,65 +803,65 @@ msgstr ""
"Namesti izvorni paket, izgradi prevedeni paket in pobriši datoteko spec, "
"izvorno kodo, krpe in ikone."
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr " --recompile <izv.pak.>"
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "kot --rebuild, a brez izgradnje kakršnegakoli paketa"
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr " --resign <paket>+ "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "podpiši paket(e) (trenutni podpis zavrzi)"
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr " --addsign <paket>+ "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "paketu(-om) dodaj podpis"
-#: rpm.c:547
+#: rpm.c:545
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <paket>+"
-#: rpm.c:548
+#: rpm.c:546
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -K <paket>+ "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "preveri podpis paketa(-ov)"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "preskoči vse podpise PGP"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr "preskoči vse podpise GPG"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "preskoči vse podpise MD5"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "preveri, če obstaja veljavna zbirka"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "ponovno izgradi zbirko iz obstoječe"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -872,7 +869,7 @@ msgstr ""
"nastavitev dovoljenja za datoteke na vrednosti v paketu, z istimi izbirnimi "
"določili kot pri -q"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -880,144 +877,144 @@ msgstr ""
"nastavitev lastnika in skupine datoteke na vrednosti v paketu, z istimi "
"izbirnimi določili kot pri -q"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "izbran sme biti le en glavni način"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u in --uninstall nista več podprti izbiri in ne delujeta več.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Namesto njiju uporabite -e ali --erase.\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "premikanja se morajo začeti z /"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "premikanja morajo vsebovati ="
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "premikanja morajo imeti /, ki mu sledi ="
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr "poti, ki niso obdelane, se morajo začeti z /"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "samo en tip poizvedbe/preverjanja je možen naenkrat"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr "nepričakovane zastavice pri poizvedbi"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr "nepričakovana oblika poizvedbe"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "nepričakovan izvor poizvedbe"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "izbiri --prefix in --relocate se medsebojno izključujeta"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "izbiri --relocate in --excludepath se lahko uporabi le pri namestitvi"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix se sme uporabiti le pri namestitvi"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti izbire --prefix se morajo začeti z /"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent sme biti podan le ob namestitvi paketa"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles sme biti podan le ob namestitvi paketa"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs sme biti podan le ob namestitvi paketa"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "izbiri --excludedocs in --includedocs se medsebojno izključujeta"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos sme podan le ob namestitvi paketa"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles sme biti podati le ob namestitvi paketa"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
@@ -1026,19 +1023,19 @@ msgstr ""
"--noscripts sme biti podan le ob namestitvi, odstranitvi ali preverjanju "
"paketa"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--allfiles sme biti podati le ob namestitvi paketa"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -1046,14 +1043,14 @@ msgstr ""
"--nodeps sme biti podan le ob izgradnji, vnovični izgradnji, prevajanju, "
"namestitvi, odstranitvi ali preverjanju paketa"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1061,97 +1058,97 @@ msgstr ""
"--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
"vnovični izgradnji paketa"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti izbire --root (-r) se morajo začeti z /"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage sme biti podan le ob nadgradnji"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp sme biti podan le ob preverjanju podpisa"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg sme biti podati le ob preverjanju podpisa"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nomd5 sme biti podan le ob preverjanju podpisa ali paketa"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr "ni datotek, ki bi jih lahko podpisal\n"
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr "dostop do datoteke %s ni možen\n"
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr "pgp manjka: "
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr "Vnesite pristopno geslo: "
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "Preverjanje pristopnega gesla neuspešno\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "Pristopno geslo je pravo.\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Neveljaven %%_signature v makro-datoteki.\n"
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign sme biti podan le ob izgradnji paketa"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr "izvajanje je bilo neuspešno\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "nepričakovani argumenti za --querytags "
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "paketi za katere bi bilo potrebno preveriti podpis niso navedeni"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "paketi katere bi bilo potrebno podpisati niso navedeni"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "paketi katere bi bilo potrebno odstraniti niso navedeni"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "pri poizvedbi paketov so podani odvečni argumenti"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "argumenti za poizvedbo niso podani"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr "pri preverjanju paketov so podani odvečni argumenti"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "argumenti za preverjanje niso podani"
@@ -1598,6 +1595,11 @@ msgstr " -U <paket> "
msgid " --erase <package>"
msgstr " --erase <paket> "
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " --resign <paket>+ "
+
#: rpmqv.c:660
#, fuzzy
msgid " --resign <pkg>+ "
@@ -2011,7 +2013,7 @@ msgstr "Izdelujemo podpis: %d\n"
msgid "Could not open %s: %s\n"
msgstr "Ni možno odpreti %s: %s\n"
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Ni možno zapisati paketa: %s"
@@ -2041,7 +2043,7 @@ msgstr "Ikone %s ni možno prebrati: %s"
msgid "Unable to write payload to %s: %s\n"
msgstr "Ni možno zapisati paketa %s: %s"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr "Zapisano: %s\n"
@@ -2489,11 +2491,11 @@ msgstr "odpiranje datoteke %s v načinu 0x%x\n"
msgid "cannot get %s lock on database\n"
msgstr "datoteke ni možno %s zakleniti"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr "izključujoče"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr "skupno"
@@ -2522,12 +2524,12 @@ msgstr "zaprto db kazalo %s/%s\n"
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "odpiranje db kazala %s/%s %s način=0x%x\n"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, fuzzy, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "ni možno zakleniti z %s datotek %s/%s\n"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, fuzzy, c-format
msgid "locked db index %s/%s\n"
msgstr "zaklenjeno db kazalo %s/%s\n"
@@ -2555,7 +2557,7 @@ msgstr ""
"števila, prezrto\n"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2564,97 +2566,107 @@ msgstr ""
"odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+#, fuzzy
+msgid "NO "
+msgstr "NI DOBRO"
+
+#: lib/depends.c:960
#, fuzzy, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr "%s: %-45s DA (dodane datoteke)\n"
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, fuzzy, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr "%s: %-45s DA (dodane ponudbe)\n"
-#: lib/depends.c:1073
-#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+#: lib/depends.c:1071
+#, fuzzy, c-format
+msgid "%s: %-45s %-s (cached)\n"
msgstr "%s: %-45s %-3s (predpomnjeno)\n"
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, fuzzy, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, fuzzy, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr "%s: %-45s DA (db datoteke)\n"
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, fuzzy, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr "%s: %-45s DA (db ponudbe)\n"
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, fuzzy, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr "%s: %s zadovoljen ob paketih db.\n"
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr "%s: %-45s NE\n"
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, fuzzy, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, fuzzy, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "paket %s jw v sporu z: %s\n"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, fuzzy, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr "odstranjujemo seznam skupin\n"
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2672,8 +2684,8 @@ msgstr ""
"Če \"rpm --rebuilddb\" ne reši problema, so dodatne informacije na voljo\n"
"na strani http://www.rpm.org ali po dopisni listi rpm-list@redhat.com.\n"
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr "(ni število)"
@@ -2715,32 +2727,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "vrstica %d: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "opozorilo: %s shranjen kot %s"
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "ni možno odstraniti %s - imenik ni prazen"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "odstranitev imenika %s je bila neuspešna: %s"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "odpiranje %s je bilo neuspešno: %s\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "opozorilo: %s ustvarjen kot %s"
@@ -2751,92 +2763,92 @@ msgstr "opozorilo: %s ustvarjen kot %s"
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "števec grabData() RPM_STRING_TYPE mora biti 1.\n"
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr "Tip podatkov %d ni podprt\n"
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "Nepravilno stanje števca za headerAddEntry(): %d\n"
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr "manjkajoči { za %"
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr "manjkajoči } za %{"
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr "oblika značke manjka"
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr "ime značke manjka"
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr "neznana značka"
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr "na koncu polja je pričakovan ]"
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr "nepričakovan ]"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr "nepričakovan }"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr "v izrazu je pričakovan ?"
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr "v izrazu je za { pričakovan ?"
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr "v izrazu je pričakovan }"
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr "za podizrazom ? je pričakovano :"
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr "v izrazu je za : pričakovan {"
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr "na koncu izraza je pričakovan |"
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr "(neznan tip)"
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "napaka pri ustvarjanju začasne datoteke %s"
@@ -2846,7 +2858,7 @@ msgstr "napaka pri ustvarjanju začasne datoteke %s"
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ta različica RPM podpira samo pakete z glavnim številom različice <= 3"
-#: lib/package.c:179
+#: lib/package.c:181
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
@@ -3092,246 +3104,245 @@ msgstr " potrebuje %s-%s-%s\n"
msgid " conflicts with %s-%s-%s\n"
msgstr " je v sporu z %s-%s-%s\n"
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "paket %s-%s-%s je za drug tip arhitekture"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "paket %s-%s-%s je za drug operacijski sistem"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "paket %s-%s-%s je že nameščen"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "paketa %s ni možno prestaviti\n"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, fuzzy, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr "datoteka %s je v sporu med poskusom namestitve %s in %s"
-#: lib/problems.c:121
+#: lib/problems.c:140
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
"datoteka %s nameščena z %s-%s-%s je v sporu z datoteko iz paketa %s-%s-%s"
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "paket %s-%s-%s (ki je novejši kot %s-%s-%s) je že nameščen"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, fuzzy, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datotečnem sistemu %s"
-#: lib/problems.c:141
+#: lib/problems.c:160
#, fuzzy, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "paket %s pred-prenosljivih sistemskih klicov: %s ni uspelo: %s"
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, fuzzy, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s"
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "ni možno ustvariti %s: %s\n"
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "pisanje na %s ni možno"
-#: lib/psm.c:604
+#: lib/psm.c:605
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "pričakovan je bil izvorni paket, najden binarni"
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "izvorni paket ne vsebuje datoteke .spec"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "skript se ni uspešno izvedel"
-#: lib/psm.c:961
+#: lib/psm.c:962
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "skript se ni uspešno izvedel"
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "paket: %s-%s-%s datoteke test = %d\n"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, fuzzy, c-format
msgid "user %s does not exist - using root\n"
msgstr "uporabnik %s ne obstaja - uporabljam root"
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "skupina %s ne obstaja - uporabljam root"
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "razširitev arhiva je bilo neuspešno%s%s: %s"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr " za datoteko "
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "poganjanje ponamestitvenih skript (če obstajajo)\n"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "napaka v obliki: %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr "(ne vsebuje datotek)"
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr "normalno "
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr "nadomeščeno "
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr "ni nameščeno "
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr "omrežni "
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr "(neznano %3d) "
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr "(brez stanja) "
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
-#: lib/query.c:438
+#: lib/query.c:392
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "ni možno poizvedeti o %s: %s\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr "odpiranje %s je bilo neuspešno: %s\n"
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr "poizvedba po izvornih paketih v stari obliki ni možna\n"
-
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
-msgstr "%s najverjetneje ni paket RPM\n"
-
-#: lib/query.c:590
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr "poizvedba po %s je bila neuspešna\n"
-#: lib/query.c:624
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
+msgstr "poizvedba po izvornih paketih v stari obliki ni možna\n"
+
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: branje Fread je bilo neuspešno: %s\n"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "poizvedba po datoteki spec. %s je bila neuspešna, razčlemba ni možna\n"
-#: lib/query.c:647
+#: lib/query.c:622
#, fuzzy
msgid "no packages\n"
msgstr "ni paketov\n"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s ne vsebuje nobenega paketa\n"
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr "noben paket ne proži %s\n"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr "noben paket ne potrebuje %s\n"
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr "noben paket ne nudi %s\n"
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr "datoteka %s: %s\n"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "datoteka %s ni del nobenega paketa\n"
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "neveljavna številka paketa: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "številka zapisa paketa: %d\n"
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr "zapisa %d ni možno prebrati\n"
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s ni nameščen\n"
@@ -3573,118 +3584,95 @@ msgstr "odstranjevanje imenika: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "neuspešna odstranitev imenika %s: %s\n"
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "paketi za namestitev niso navedeni"
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr "štetje paketov za namestitev\n"
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr "najdeno %d paketov\n"
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr "iskanje paketov za prenos po omrežju\n"
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "preskočeno - %s - rpmGlob neuspešen(%d)\n"
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr "Prenašanje %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr " ... kot %s\n"
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "preskočeno - %s - prenos neuspešen - %s\n"
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr "prenešenih je bilo %d paketov\n"
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "ni možno odpreti datoteke %s: %s\n"
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr "%s ni možno namestiti\n"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "zbirko podatkov paketov ni možno odpreti v %s\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paketa %s ni možno premakniti\n"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr "napaka pri branju iz datoteke %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, 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:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr "%s ni možno namestiti\n"
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "najdeno %d izvornih in %d binarnih paketov\n"
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "neuspešne soodvisnosti:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr "nameščanje binarnih paketov\n"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "ni možno odpreti datoteke %s: %s\n"
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "datoteke %s/packages.rpm ni možno odpreti\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" določa več paketov\n"
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ni možno odpreti %s: %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "Nameščanje %s\n"
@@ -3920,50 +3908,50 @@ msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "OS je izključen: %s"
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "premikanje %s v %s\n"
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "izključevanje datoteke %s%s\n"
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "izključevanje datoteke %s%s\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr "premikanje %s v %s\n"
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "premiokanje imenika %s v %s\n"
-#: lib/transaction.c:617
-#, c-format
-msgid "excluding directory %s\n"
-msgstr "izključevanje imenika %s\n"
-
-#: lib/transaction.c:741
+#: lib/transaction.c:771
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s preskočen zaradi manjkajoče zastavice OK\n"
+#: lib/transaction.c:1359
+#, c-format
+msgid "excluding directory %s\n"
+msgstr "izključevanje imenika %s\n"
+
#: lib/verify.c:61
msgid "don't verify files in package"
msgstr "brez preverjanja datotek v paketu"
@@ -3973,24 +3961,24 @@ msgstr "brez preverjanja datotek v paketu"
msgid "do not execute %verifyscript (if any)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/verify.c:253
+#: lib/verify.c:257
#, fuzzy
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
"v paketu manjka tako seznam uporabnikov kot identitet (to se ne sme zgoditi)"
-#: lib/verify.c:271
+#: lib/verify.c:275
#, fuzzy
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
"v paketu manjka tako seznam skupin kot identitet (to se ne sme zgoditi)"
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "manjka %s\n"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
@@ -4206,6 +4194,30 @@ msgstr "vrata URL morajo biti številka\n"
msgid "failed to create %s: %s\n"
msgstr "neuspešno ustvarjanje %s: %s\n"
+#~ msgid " --timecheck <secs> "
+#~ msgstr " --timecheck <sek> "
+
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "največji dopustni čas izgradnje paketa (0 brez omejitev)"
+
+#~ msgid "%s does not appear to be a RPM package\n"
+#~ msgstr "%s najverjetneje ni paket RPM\n"
+
+#~ msgid "counting packages to install\n"
+#~ msgstr "štetje paketov za namestitev\n"
+
+#~ msgid "found %d packages\n"
+#~ msgstr "najdeno %d paketov\n"
+
+#~ msgid "looking for packages to download\n"
+#~ msgstr "iskanje paketov za prenos po omrežju\n"
+
+#~ msgid "skipping %s - rpmGlob failed(%d)\n"
+#~ msgstr "preskočeno - %s - rpmGlob neuspešen(%d)\n"
+
+#~ msgid "retrieved %d packages\n"
+#~ msgstr "prenešenih je bilo %d paketov\n"
+
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
@@ -4685,10 +4697,6 @@ msgstr "neuspešno ustvarjanje %s: %s\n"
#~ msgid "%s: %-45s YES (rpmlib version)\n"
#~ msgstr "%s: %s zadovoljen ob različici rpmlib.\n"
-#, fuzzy
-#~ msgid " -K <pkg>+ "
-#~ msgstr " --resign <paket>+ "
-
#~ msgid "line %d: Version not permitted: %s"
#~ msgstr "vrstica %d: Različica ni dovoljena: %s"
diff --git a/po/sr.po b/po/sr.po
index d85226afa..03fa2155e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
"From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -397,12 +397,12 @@ msgstr "broj porta FTP servera (ili proxy)"
msgid "query mode"
msgstr "režim upita"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "koristi <dir> kao direktorijum baze podataka"
@@ -419,7 +419,7 @@ msgstr "koristi s kao format zaglavlja (povlači -i)"
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "koristi <dir> kao direktorijum najvišeg nivoa"
@@ -689,6 +689,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " -b<faza> <spec>\t "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "izbriši (deinstaliraj) paket"
@@ -787,21 +792,11 @@ msgstr ""
msgid "do not execute any stages"
msgstr "nemoj izvršiti nijednu fazu"
-#: rpm.c:534
-#, fuzzy
-msgid " --timecheck <secs> "
-msgstr " -b<faza> <spec>\t "
-
#: rpm.c:535
-#, fuzzy
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "postavi vremensku proveru na S sekundi (0 je deaktivira)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -809,68 +804,68 @@ msgstr ""
"instaliraj izvorni paket, napravi binarni paket i ukloni specifikaciju, "
"izvorne datoteke, zakrpe i ikone."
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "kao i --rebuild, samo nemoj praviti nikakav paket"
-#: rpm.c:543
+#: rpm.c:541
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "potpiši paket (ukloni tekući potpis)"
-#: rpm.c:545
+#: rpm.c:543
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "dodaj potpis u paket"
-#: rpm.c:547
+#: rpm.c:545
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<faza> <spec>\t "
-#: rpm.c:548
+#: rpm.c:546
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "proveri potpis u paketu"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "preskoči sve PGP potpise"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
#, fuzzy
msgid "skip any GPG signatures"
msgstr "preskoči sve PGP potpise"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "preskoči sve MD5 potpise"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "uveri se da postoji ispravna baza podataka"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -878,7 +873,7 @@ msgstr ""
"postavi dozvole datoteke kao one u bazi podataka paketa koristeći iste "
"opcije za određenje datoteka kao i -q"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -886,149 +881,149 @@ msgstr ""
"postavi vlasnika i grupu datoteke kao i one u bazi podataka paketa koristeći "
"iste opcije za određenje datoteka kao i -q"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "samo jedan glavni režim može biti naveden"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u i --uninstall nisu više podržani i ne rade više.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Koristite -e ili --erase.\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "premeštanja moraju početi znakom '/'"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "premeštanja moraju imati znak ="
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "premeštanja moraju imati / praćeno sa ="
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "premeštanja moraju početi znakom '/'"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "samo jedan tip upita/provere može biti urađen odjednom"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
#, fuzzy
msgid "unexpected query flags"
msgstr "neočekivan izvor upita"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
#, fuzzy
msgid "unexpected query format"
msgstr "neočekivan izvor upita"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "neočekivan izvor upita"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "samo instalacija i ažuriranje mogu biti forsirane"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "datoteke mogu biti premeštene samo tokom instalacije paketa"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "samo jedno možete koristiti: --prefix ili --relocate"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate možete koristiti samo kad instalirate novi paket"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix možete koristiti samo kod instalacije novog paketa"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti za --prefix moraju početi znakom /"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) možete koristiti samo kod instalacije paketa"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent možete koristiti samo kod instalacije paketa"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles možete koristiti samo kod instalacije paketa"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs možete koristiti samo kod instalacije paketa"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludecocs možete koristiti samo kod instalacije paketa"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr "--includecocs možete koristiti samo kod instalacije paketa"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "samo jedno možete da navedete: --excludedocs ili --includedocs"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch možete koristiti samo kod instalacije paketa"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos možete koristiti samo kod instalacije paketa"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos možete koristiti samo kod instalacije paketa"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches možete koristiti samo kod brisanja paketa"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles možete koristiti samo kod instalacije paketa"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
@@ -1037,19 +1032,19 @@ msgstr ""
"--noscripsts možete koristiti samo kod instalacije, uklanjanja ili provere "
"paketa"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--allfiles možete koristiti samo kod instalacije paketa"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1057,14 +1052,14 @@ msgid ""
msgstr ""
"--nodeps možete koristiti samo kod instalacije, uklanjanja ili provere paketa"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test možete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1072,102 +1067,102 @@ msgstr ""
"--root (-r) možete navesti samo kod instalacije, uklanjanja, upita ili "
"rekreiranja baze podataka"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti za --root (-r) moraju početi znakom /"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage se može koristiti samo tokom ažuriranja paketa"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp se može koristiti samo prilikom provere potpisa"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nopgp se može koristiti samo prilikom provere potpisa"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nopgp se može koristiti samo kod provere potpisa ili paketa"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
#, fuzzy
msgid "pgp not found: "
msgstr "Datoteka nije pronađena na serveru"
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "Neuspela provera lozinke\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "Lozinka je dobra.\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign se može koristiti samo kod kreiranja paketa"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "neočekivani argumenti za --querytags"
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "nedostaje paket za proveru potpisa"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "nedostaje paket za potpisivanje"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "neodstaje paket za deinstalaciju"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "nedostaje paket za instalaciju"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "suvišni argumenti su navedeni za upit nad svim paketima"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "nedostaju argumenti za upit"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "suvišni argumenti su navedeni za upit nad svim paketima"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "nedostaju argumenti za proveru"
@@ -1611,6 +1606,11 @@ msgstr " -b<faza> <spec>\t "
msgid " --erase <package>"
msgstr "instaliraj paket"
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " -b<faza> <spec>\t "
+
#: rpmqv.c:660
#, fuzzy
msgid " --resign <pkg>+ "
@@ -2011,7 +2011,7 @@ msgstr "napravi PGP potpis"
msgid "Could not open %s: %s\n"
msgstr "neuspelo otvaranje %s\n"
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Ne mogu da upišem %s"
@@ -2041,7 +2041,7 @@ msgstr "Ne mogu da upišem %s"
msgid "Unable to write payload to %s: %s\n"
msgstr "Ne mogu da upišem %s"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2476,11 +2476,11 @@ msgstr "rekreiraj bazu podataka iz postojeće baze"
msgid "cannot get %s lock on database\n"
msgstr "ne mogu da dobijem %s zaključavanje baze podataka"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr "ekskluzivno"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr "deljeno"
@@ -2509,12 +2509,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, fuzzy, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "ne mogu da dobijem %s zaključavanje baze podataka"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2540,104 +2540,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
-#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
-msgstr ""
+#: lib/depends.c:1071
+#, fuzzy, c-format
+msgid "%s: %-45s %-s (cached)\n"
+msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, fuzzy, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, fuzzy, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, fuzzy, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, fuzzy, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "paket %s nije naveden u %s"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "paket %s nije naveden u %s"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, fuzzy, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr "greška uklanjanja sloga %s u %s"
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2651,8 +2660,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr "(nije broj)"
@@ -2694,32 +2703,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "ne mogu da uklonim %s - direktorijum nije prazan"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "neuspela komanda rmdir %s: %s"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "neuspelo otvaranje %s: %s\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
@@ -2729,94 +2738,94 @@ msgstr "Ne mogu da otvorim datoteku %s: "
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr "nedostaje { posle %"
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr "nedostaje } posle %"
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr "prazan 'tag' format'"
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr "prazno ime tag-a"
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr "nepoznat tag"
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr "] očekivano na kraju niza"
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr "neočekivano ]"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr "neočekivano }"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr "očekivan znak ? u izrazu"
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
#, fuzzy
msgid "{ expected after ? in expression"
msgstr "{ očekivano posle ? u izrazu"
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr "} očekivano u izrazu"
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr "očekivano : praćeno ? podizrazom"
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
#, fuzzy
msgid "{ expected after : in expression"
msgstr "{ očekivano posle : u izrazu"
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr "| očekivano na kraju izraza"
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr "(nepoznat tip)"
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
@@ -2826,7 +2835,7 @@ msgstr "greška kod kreiranja direktorijuma %s: %s"
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "samo paketi sa glavnim brojevima <= 3 su podržani u ovoj verziji RPM-a"
-#: lib/package.c:179
+#: lib/package.c:181
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
@@ -3077,245 +3086,244 @@ msgstr " je potreban paketu %s-%s-%s\n"
msgid " conflicts with %s-%s-%s\n"
msgstr " se sudara sa %s-%s-%s\n"
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "paket %s-%s-%s sadrži deljene datoteke\n"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "paket %s-%s-%s sadrži deljene datoteke\n"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "paket %s nije instaliran\n"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "paket %s nije instaliran\n"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr " se sudara sa %s-%s-%s\n"
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "paket %s-%s-%s sadrži deljene datoteke\n"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, fuzzy, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "paket %s-%s-%s sadrži deljene datoteke\n"
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "upit nad paketom koji ima <datoteku>"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "neuspelo izvršavanje skripta"
-#: lib/psm.c:961
+#: lib/psm.c:962
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "neuspelo izvršavanje skripta"
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "paket %s-%s-%s sadrži deljene datoteke\n"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "grupa %s ne sadrži nijedan paket\n"
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "neuspelo otvaranje %s: %s\n"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "nemoj izvršiti nijednu fazu"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "greška u formatu: %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr "(nema datoteka)"
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
#, fuzzy
msgid "not installed "
msgstr "paket %s nije instaliran\n"
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, fuzzy, c-format
msgid "(unknown %3d) "
msgstr "(nepoznat tip)"
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "paket nema imena"
-#: lib/query.c:438
+#: lib/query.c:392
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "greška: ne mogu da otvorim %s\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "neuspelo otvaranje %s: %s\n"
-#: lib/query.c:576
-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:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
-msgstr "%s ne liči na RPM paket\n"
-
-#: lib/query.c:590
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr "upit nad %s neuspeo\n"
-#: lib/query.c:624
+#: lib/query.c:531
+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:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: Neuspeo 'readLead'\n"
+
+#: lib/query.c:599
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "upit nad %s neuspeo\n"
-#: lib/query.c:647
+#: lib/query.c:622
#, fuzzy
msgid "no packages\n"
msgstr "upit nad svim paketima"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupa %s ne sadrži nijedan paket\n"
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr "nijedan paket ne aktivira %s\n"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr "nijedan paket ne zahteva %s\n"
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr "nijedan paket ne obezbeđuje %s\n"
-#: lib/query.c:720
+#: lib/query.c:695
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "pogrešan broj paketa: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "pogrešan broj paketa: %s\n"
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr "ne mogu da pročitam slog %d\n"
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
@@ -3554,121 +3562,96 @@ msgstr "greška kod kreiranja direktorijuma %s: %s"
msgid "failed to remove directory %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "nedostaje paket za instalaciju"
-#: lib/rpminstall.c:210
-#, fuzzy
-msgid "counting packages to install\n"
-msgstr "nedostaje paket za instalaciju"
-
-#: lib/rpminstall.c:214
-#, fuzzy, c-format
-msgid "found %d packages\n"
-msgstr "upit nad svim paketima"
-
-#: lib/rpminstall.c:219
-#, fuzzy
-msgid "looking for packages to download\n"
-msgstr "greška kod potrage za paketom %s\n"
-
-#: lib/rpminstall.c:234
-#, fuzzy, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr "Pribavljam %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, fuzzy, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "Ne mogu da otvorim datoteku %s: "
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, fuzzy, c-format
-msgid "%s cannot be installed\n"
-msgstr "greška: %s se ne može instalirati\n"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, 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:366
+#: lib/rpminstall.c:375
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s nije instaliran\n"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, fuzzy, c-format
+msgid "%s cannot be installed\n"
+msgstr "greška: %s se ne može instalirati\n"
+
+#: lib/rpminstall.c:472
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "grupa %s ne sadrži nijedan paket\n"
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "loše međuzavisnosti:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
#, fuzzy
msgid "installing binary packages\n"
msgstr "instaliraj paket"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, fuzzy, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "Ne mogu da otvorim datoteku %s: "
+
+#: lib/rpminstall.c:580
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" određuje više paketa\n"
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "uklanjanje oviha paketa će narušiti zavisnosti:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "greška: ne mogu da otvorim %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
@@ -3907,50 +3890,50 @@ msgstr "Morate podesiti \"pgp_name:\" u vašoj rpmrc datoteci"
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Morate podesiti \"pgp_name:\" u vašoj rpmrc datoteci"
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "Pribavljam %s\n"
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "Pribavljam %s\n"
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "Pribavljam %s\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: lib/transaction.c:617
-#, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "greška kod kreiranja direktorijuma %s: %s"
-
-#: lib/transaction.c:741
+#: lib/transaction.c:771
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
+#: lib/transaction.c:1359
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "greška kod kreiranja direktorijuma %s: %s"
+
#: lib/verify.c:61
#, fuzzy
msgid "don't verify files in package"
@@ -3961,20 +3944,20 @@ msgstr "instaliraj paket"
msgid "do not execute %verifyscript (if any)"
msgstr "nemoj izvršiti nijednu fazu"
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "nedostaje { posle %"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Nezadovoljene međuzavisnosti za %s-%s-%s: "
@@ -4190,6 +4173,33 @@ msgid "failed to create %s: %s\n"
msgstr "neuspelo kreiranje %s\n"
#, fuzzy
+#~ msgid " --timecheck <secs> "
+#~ msgstr " -b<faza> <spec>\t "
+
+#, fuzzy
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "postavi vremensku proveru na S sekundi (0 je deaktivira)"
+
+#~ msgid "%s does not appear to be a RPM package\n"
+#~ msgstr "%s ne liči na RPM paket\n"
+
+#, fuzzy
+#~ msgid "counting packages to install\n"
+#~ msgstr "nedostaje paket za instalaciju"
+
+#, fuzzy
+#~ msgid "found %d packages\n"
+#~ msgstr "upit nad svim paketima"
+
+#, fuzzy
+#~ msgid "looking for packages to download\n"
+#~ msgstr "greška kod potrage za paketom %s\n"
+
+#, fuzzy
+#~ msgid "skipping %s - rpmGlob failed(%d)\n"
+#~ msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
+
+#, fuzzy
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
@@ -4413,10 +4423,6 @@ msgstr "neuspelo kreiranje %s\n"
#~ msgstr "\t\t\t paket1 ...paketN"
#, fuzzy
-#~ msgid " -K <pkg>+ "
-#~ msgstr " -b<faza> <spec>\t "
-
-#, fuzzy
#~ msgid "line %d: Version not permitted: %s"
#~ msgstr "paket %s nije naveden u %s"
diff --git a/po/sv.po b/po/sv.po
index 7b4635b37..42e25f04b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: 2000-10-09 22:31+0200\n"
"Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -385,11 +385,11 @@ msgstr "http-servers (eller ombuds) portnummer"
msgid "query mode"
msgstr "frĺgeläge"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr " --dbpath <kat> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "använd <kat> som katalog för databasen"
@@ -405,7 +405,7 @@ msgstr "använd <ffmt> som huvudformat (medför --info)"
msgid " --root <dir> "
msgstr " --root <kat> "
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "använd <kat> som toppkatalog"
@@ -663,6 +663,11 @@ msgstr ""
msgid " --erase <package>"
msgstr " --erase <paket>"
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " -i <paketfil> "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "ta bort (avinstallera) paket"
@@ -756,19 +761,11 @@ msgstr "tillverka paketen för mĺlen plattfrm1...plattfrmN."
msgid "do not execute any stages"
msgstr "utför inga steg"
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr " --timecheck <sek> "
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "sätt tidskontrollen till <sek> sekunder (0 slĺr av)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <källpaket> "
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -776,63 +773,63 @@ msgstr ""
"installera källpaket, tillverka binärpaket och ta bort spec-fil, källkod, "
"patchar och ikoner."
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr " --recompile <källpkt> "
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "som --rebuild, men tillverka inga paket"
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr " --resign <pkt>+ "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "signera ett paket (släng nuvarande signatur)"
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr " --addsign <pkt>+ "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "lägg till signatur till ett paket"
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr " --checksig <pkt>+"
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr " -K <pkt>+ "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "verifiera paketsignatur"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "hoppa över eventuella PGP-signaturer"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr "hoppa över eventuella GPG-signaturer"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "hoppa över eventuella MD5-signaturer"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "förvissa dig om att en giltig databas existerar"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "bygg om databasen frĺn existerande databas"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -840,7 +837,7 @@ msgstr ""
"sätt filrättigheterna till de i paketdatabasen med samma "
"paketspecifikationsflaggor som -q"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -848,146 +845,146 @@ msgstr ""
"sätt filägare och -grupp till de i paketdatabasen med samma "
"paketspcifikationsflaggor som -q"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "enbart ett läge kan specifieras"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u och --uninstall undanbedes och fungerar inte längre.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Använd -e eller --erase istället.\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "omflyttningar mĺste börja med /"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "omflyttningar mĺste innehĺlla ett ="
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "omflyttningar mĺste ha ett / efter ="
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr "uteslutna sökvägar mĺste börja med /"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Internt fel i argumenthantering (%d) :-(\n"
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "endast en typ av undersökning/verifiering kan utföras ĺt gĺngen"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr "oväntade undersökningsflaggor"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr "oväntat undersökningsformat"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "oväntad undersökningskälla"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "filer kan relokeras endast under paketinstallation"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "enbart en av --prefix eller --relocate kan användas"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate och --excludepath kan endast användas när nya paket installeras"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan endast användas när nya paket installeras"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "argument till --prefix mĺste börja med /"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan enbart användas vid paketinstallation"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent kan enbart användas vid paketinstallation"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan enbart användas vid paketinstallation"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs kan enbart användas vid paketinstallation"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs kan enbart användas vid paketinstallation"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs kan enbart användas vid paketinstallation"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "enbart en av --excludedocs och --includedocs läge kan specifieras"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch kan enbart användas vid paketinstallation"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos kan enbart användas vid paketinstallation"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize kan enbart användas vid paketinstallation"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches kan enbart användas när paket tas bort"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles kan enbart användas vid paketinstallation"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb kan enbart användas vid installation och avinstallation av paket"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
@@ -996,12 +993,12 @@ msgstr ""
"--noscripts kan enbart användas vid paketinstallation, avinstallation och "
"verifiering"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--allfiles kan enbart användas vid paketinstallation"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -1009,7 +1006,7 @@ msgid ""
msgstr ""
"--notriggers kan enbart användas vid installation och avinstallation av paket"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -1017,14 +1014,14 @@ msgstr ""
"--nodeps kan enbart användas vid tillverkning, omtillverkning, "
"omkompilering, installation, avinstallation, och verifiering"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test kan enbart användas vid installation, avinstallation och tillverkning"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1032,97 +1029,97 @@ msgstr ""
"--root (-r) kan enbart användas vid installation, avinstallation, förfrĺgan, "
"och databasombyggnad"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "argument till --root (-r) mĺste börja med /"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage kan enbart användas vid paketuppgraderingar"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp kan enbart användas vid signaturkontroll"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg kan enbart användas vid signaturkontroll"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nomd5 kan enbart användas vid signaturkontroll och paketverifiering"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr "inga filer att signera\n"
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr "kan inte komma ĺt filen %s\n"
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr "pgp hittades inte: "
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr "Ange lösenfras: "
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "Kontrollen av lösenfrasen misslyckades\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "Lösenfrasen är ok.\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Felaktig %%_signature spec i makrofil.\n"
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign kan enbart användas vid pakettillverkning"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr "exec misslyckades\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "oväntade argument till --querytags "
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "inga paket angivna för signaturkontroll"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "inga paket angivna för signering"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "inga paket angivna för avinstallation"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "inga paket angivna för installation"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "extra argument angivna för förfrĺgan om alla paket"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "inga parametrar angivna för undersökning"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr "extra argument angivna för verifiering av alla paket"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "inga parametrar angivna för verifiering"
@@ -1531,6 +1528,11 @@ msgstr " -U <paketfil> "
msgid " --erase <package>"
msgstr " --erase <paket> "
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " -K <pkt>+ "
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr " --resign <pkt>+ "
@@ -1940,7 +1942,7 @@ msgstr "Genererar signatur: %d\n"
msgid "Could not open %s: %s\n"
msgstr "Kunde inte öppna %s: %s\n"
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Kunde inte skriva paket: %s"
@@ -1970,7 +1972,7 @@ msgstr "Kan inte läsa ikon %s: %s"
msgid "Unable to write payload to %s: %s\n"
msgstr "Kan inte skriva paket %s: %s"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr "Skrev: %s\n"
@@ -2416,11 +2418,11 @@ msgstr "öppnar db-fil %s rättighet 0x%x\n"
msgid "cannot get %s lock on database\n"
msgstr "kan inte fĺ %s lĺs pĺ databas"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr "uteslutande"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr "delat"
@@ -2449,12 +2451,12 @@ msgstr "tog bort db-index %s/%s\n"
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "öppnar db-index %s/%s %s rättighet=0x%x\n"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "kan inte fĺ %s lĺs pĺ %s/%s\n"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr "lĺste db-index %s/%s\n"
@@ -2480,7 +2482,7 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr "%s har för stort eller för litet heltalsvärde, hoppar över\n"
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2489,97 +2491,107 @@ msgstr ""
"\"B\"-beroendet behöver en epok (antar samma som \"A\")\n"
"\tA %s\tB %s\n"
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr " %s A %s\tB %s\n"
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+#, fuzzy
+msgid "NO "
+msgstr "EJ OK"
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr "%s: %-45s JA (lade till filer)\n"
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr "%s: %-45s JA (lade till tillhandahĺllande)\n"
-#: lib/depends.c:1073
-#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+#: lib/depends.c:1071
+#, fuzzy, c-format
+msgid "%s: %-45s %-s (cached)\n"
msgstr "%s: %-45s %-3s (cachad)\n"
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr "%s: %-45s JA (rpmrc tillhandahĺller)\n"
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr "%s: %-45s JA (rpmlib tillhandahĺller)\n"
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr "%s: %-45s JA (db-filer)\n"
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr "%s: %-45s JA (db tillhandahĺllande)\n"
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, fuzzy, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr "%s: %-45s JA (db-filer)\n"
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr "%s: %-45s NEJ\n"
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr "paket %s stĺr i konflikt: %s\n"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, fuzzy, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr "tar bort \"%s\" frĺn %s-indexet.\n"
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2598,8 +2610,8 @@ msgstr ""
"rpm-list@redhat.com om \"rpm --rebuilddb\" inte lyckas rätta till "
"problemet.\n"
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr "(inte ett tal)"
@@ -2641,32 +2653,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "rad %d: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "varning: %s sparades som %s"
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "kan inte ta bort %s - katalogen är inte tom"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "rmdir av %s misslyckades: %s"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "misslyckades öppna %s: %s\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "varning: %s skapades som %s"
@@ -2677,92 +2689,92 @@ msgstr "varning: %s skapades som %s"
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr "grabData() RPM_STRING_TYPE mĺste vara 1.\n"
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr "Datatyp %d stöds inte\n"
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr "Felaktigt antal till headerAddEntry(): %d\n"
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr "{ fattas efter %"
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr "} fattas efter %{"
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr "tomt taggformat"
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr "tomt taggnamn"
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr "okänd tagg"
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr "] förväntades vid slutet pĺ vektor"
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr "oväntad ]"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr "oväntad }"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr "? förväntades i uttryck"
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr "{ förväntades efter ? i uttryck"
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr "} förväntades i uttryck"
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ": förväntades efter ? i deluttryck"
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr "{ förväntades efter : i uttryck"
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr "| förväntades vid slutet pĺ uttryck"
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr "(okänd typ)"
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "fel när tämporärfil %s skapades"
@@ -2772,7 +2784,7 @@ msgstr "fel när tämporärfil %s skapades"
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM"
-#: lib/package.c:179
+#: lib/package.c:181
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
@@ -3013,247 +3025,246 @@ msgstr " behövs av %s-%s-%s\n"
msgid " conflicts with %s-%s-%s\n"
msgstr " stĺr i konflikt med %s-%s-%s\n"
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "paket %s-%s-%s är för en annan arkitektur"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "paket %s-%s-%s är för ett annat operativsystem"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "paket %s-%s-%s är redan installerat"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "paket %s är inte relokerbart\n"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, fuzzy, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
"filen %s är en konflikt mellan installationsförsök av %s-%s-%s och %s-%s-%s"
-#: lib/problems.c:121
+#: lib/problems.c:140
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
"filen %s frĺn installation av %s-%s-%s stĺr i konflikt med filen frĺn paket "
"%s-%s-%s"
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "paket %s-%s-%s (som är nyare än %s-%s-%s) är redan installerat"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, fuzzy, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr "installation av paket %s-%s-%s kräver %ld%cb pĺ filsystem %s"
-#: lib/problems.c:141
+#: lib/problems.c:160
#, fuzzy, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr "installation av paket %s-%s-%s kräver %ld%cb pĺ filsystem %s"
-#: lib/problems.c:146
+#: lib/problems.c:165
#, fuzzy, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "paket %s-%s-%s systemanrop före transaktion: %s misslyckades: %s"
-#: lib/problems.c:153
+#: lib/problems.c:172
#, fuzzy, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "okänt fel %d uppträdde under manipulation av paket %s-%s-%s"
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "kan inte skapa %s: %s\n"
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "kan inte skriva till %s"
-#: lib/psm.c:604
+#: lib/psm.c:605
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "källpaket förväntades, fann binärpaket"
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "källpaket innehĺller ingen spec-fil"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "körning av skript frĺn %s-%s-%s misslyckades, slutstatus %d"
-#: lib/psm.c:961
+#: lib/psm.c:962
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "körning av skript frĺn %s-%s-%s misslyckades, slutstatus %d"
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "paket: %s-%s-%s filtest = %d\n"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, fuzzy, c-format
msgid "user %s does not exist - using root\n"
msgstr "användaren %s finns inte - använder root"
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "gruppen %s finns inte - använder root"
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "uppackning av arkiv misslyckades%s%s: %s"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr " vid fil "
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "kör (eventuellt) postinstallationsskript\n"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "fel i format: %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr "(innehĺller inga filer)"
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr "normal "
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr "ersatt "
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr "oinstallerat "
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr "nätdelad "
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr "(okänd %3d) "
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr "(ej tillstnd) "
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "paketet har varken filägare eller id-listor"
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr "kan inte frĺga om %s: %s\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr "misslyckades öppna %s: %s\n"
-#: lib/query.c:576
-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:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
-msgstr "%s verkar inte vara ett RPM-paket\n"
-
-#: lib/query.c:590
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr "frĺga om %s misslyckades\n"
-#: lib/query.c:624
+#: lib/query.c:531
+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:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: Fread misslyckades: %s\n"
+
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "frĺga om spec-fil %s misslyckades, kan inte parsa\n"
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr "inga paket\n"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupp %s innehĺller inga paket\n"
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr "inga paketutlösare %s\n"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr "inget paket behöver %s\n"
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr "inget paket tillhandahĺller %s\n"
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "filen %s tillhör inget paket\n"
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "felaktigt paketnummer: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr "paketpost nummer: %u\n"
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr "post %d kunde inte läsas\n"
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s är inte installerat\n"
@@ -3493,118 +3504,95 @@ 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:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "inga paket angivna för installation"
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr "räknar paket att installera\n"
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr "hittade %d paket\n"
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr "letar efter paket att hämta\n"
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "hoppar över %s - rpmGlob misslyckades(%d)\n"
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, 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:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hoppar över %s - överföring misslyckades - %s\n"
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr "hämtade %d paket\n"
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "kan inte öppna filen %s: %s\n"
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr "%s kan inte installeras\n"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kan inte öppna paketdatabas i %s\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s är inte relokerbart\n"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr "fel vid läsning frĺn fil %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, 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:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr "%s kan inte installeras\n"
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "hittade %d käll- och %d binärpaket\n"
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "ouppfyllda beroenden:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr "installerar binärpaket\n"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "kan inte öppna filen %s: %s\n"
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "kan inte öppna %s/packages.rpm\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" anger flera paket\n"
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "Installerar %s\n"
@@ -3840,50 +3828,50 @@ msgstr "Du mĺste sätta \"%%_gpg_name\" i din makrofil"
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Du mĺste sätta \"%%_pgp_name\" i din makrofil"
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "OS är uteslutet: %s"
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "flyttar %s till %s\n"
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "hoppar över %s%s\n"
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "hoppar över %s%s\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr "flyttar %s till %s\n"
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "flyttar katalogen %s till %s\n"
-#: lib/transaction.c:617
-#, c-format
-msgid "excluding directory %s\n"
-msgstr "hoppar över katalogen %s\n"
-
-#: lib/transaction.c:741
+#: lib/transaction.c:771
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr "%s överhoppad pĺ grund av missingok-flagga\n"
+#: lib/transaction.c:1359
+#, c-format
+msgid "excluding directory %s\n"
+msgstr "hoppar över katalogen %s\n"
+
#: lib/verify.c:61
msgid "don't verify files in package"
msgstr "verifiera inte filerna i paketet"
@@ -3893,24 +3881,24 @@ msgstr "verifiera inte filerna i paketet"
msgid "do not execute %verifyscript (if any)"
msgstr "utför inga steg"
-#: lib/verify.c:253
+#: lib/verify.c:257
#, fuzzy
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
"paket saknar bĺde användarnamn och id-listor (detta borde aldrig inträffa)"
-#: lib/verify.c:271
+#: lib/verify.c:275
#, fuzzy
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
"paket saknar bĺde gruppnamn och id-listor (detta borde aldrig inträffa)"
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "saknas %s\n"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "Ouppfyllda beroenden för %s-%s-%s: "
@@ -4126,6 +4114,30 @@ msgstr "url-port mĺste vara ett tal\n"
msgid "failed to create %s: %s\n"
msgstr "kunde inte skapa %s: %s\n"
+#~ msgid " --timecheck <secs> "
+#~ msgstr " --timecheck <sek> "
+
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "sätt tidskontrollen till <sek> sekunder (0 slĺr av)"
+
+#~ msgid "%s does not appear to be a RPM package\n"
+#~ msgstr "%s verkar inte vara ett RPM-paket\n"
+
+#~ msgid "counting packages to install\n"
+#~ msgstr "räknar paket att installera\n"
+
+#~ msgid "found %d packages\n"
+#~ msgstr "hittade %d paket\n"
+
+#~ msgid "looking for packages to download\n"
+#~ msgstr "letar efter paket att hämta\n"
+
+#~ msgid "skipping %s - rpmGlob failed(%d)\n"
+#~ msgstr "hoppar över %s - rpmGlob misslyckades(%d)\n"
+
+#~ msgid "retrieved %d packages\n"
+#~ msgstr "hämtade %d paket\n"
+
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
diff --git a/po/tr.po b/po/tr.po
index 5717936ca..5dae6f59d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -436,12 +436,12 @@ msgstr "FTP sunucusunun (ya da Proxy'nin) port numarasý"
msgid "query mode"
msgstr "Sorgulama kipi"
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<adým> <spec> "
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr "Veritabaný dizini olarak <dizin> kullanýlýr"
@@ -458,7 +458,7 @@ msgstr "'header format' olarak s kullanýlýr (-i'yi gerektirir)"
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr "kök (baţlangýç) dizini olarak <dizin> kullanýlýr"
@@ -726,6 +726,11 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+#, fuzzy
+msgid " -e <package> "
+msgstr " -b<adým> <spec> "
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr "paketi siler (uninstall)"
@@ -828,21 +833,11 @@ msgstr ""
msgid "do not execute any stages"
msgstr "adýmlarýn hiçbirini çalýţtýrmaz"
-#: rpm.c:534
-#, fuzzy
-msgid " --timecheck <secs> "
-msgstr " -b<adým> <spec> "
-
#: rpm.c:535
-#, fuzzy
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr "zaman kontrolünü S saniyeye ayarlar (0 ile tümüyle kaldýrýr)"
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -850,68 +845,68 @@ msgstr ""
"kaynak paketini yükler, çalýţýr paketi oluţturur ve spec dosyasý, kaynaklar "
"ile yamalarý siler"
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr "--rebuild gibi, ama paket yaratmaz"
-#: rpm.c:543
+#: rpm.c:541
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<adým> <spec> "
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
-#: rpm.c:545
+#: rpm.c:543
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<adým> <spec> "
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr "pakete bir imza ekler"
-#: rpm.c:547
+#: rpm.c:545
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<adým> <spec> "
-#: rpm.c:548
+#: rpm.c:546
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<adým> <spec> "
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr "paket imzasýný dođrular"
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr "tüm PGP imzalarýný atlar"
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
#, fuzzy
msgid "skip any GPG signatures"
msgstr "tüm PGP imzalarýný atlar"
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr "tüm MD5 imzalarýný atlar"
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr "geçerli bir veri tabaný olmasýný sađlar"
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur"
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -919,7 +914,7 @@ msgstr ""
"dosya eriţim haklarýný veri tabanýnda yer alanlarla -q ile belirtilen paket "
"parametrelerini kullanarak güncelle"
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -927,169 +922,169 @@ msgstr ""
"dosya kullanýcý ve grup bilgilerini veri tabanýnda yer alanlarla -q ile "
"belirtilen paket parametrelerini kullanarak güncelle"
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr "sadece bir ana kip (major mode) belirtilebilir"
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u ve --uninstall komutlarý eskidirler ve çalýţmamaktadýrlar.\n"
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr "Yerine -e veya --erase komutunu kullanýn\n"
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr "relocate iţlemi / ile baţlamalý"
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr "relocate satýrýnda = bulunmalý"
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr "relocate için = den sonra bir / gerekir"
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "relocate iţlemi / ile baţlamalý"
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr "bir anda sadece bir tarz sorgulama veya dođrulama yapýlabilir"
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
#, fuzzy
msgid "unexpected query flags"
msgstr "beklenmeyen sorgulama kaynađý girildi"
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
#, fuzzy
msgid "unexpected query format"
msgstr "beklenmeyen sorgulama kaynađý girildi"
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr "beklenmeyen sorgulama kaynađý girildi"
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "sadece yükleme ve güncelleme zorlanabilir (force edilebilir)"
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr "dosyalar sadece paket yüklemesi sýrasýnda relocate edilebilir"
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanýlabilir"
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate sadece yeni paketler yüklenirken kullanýlýr"
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix sadece yeni paketlerin yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix komutunun argümanlarý '/' ile baţlamalý"
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr "--percent sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"--excludedocs ve --includedocs bir arada kullanýlamaz (bi daha olmasýn)"
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches sadece paket silinmesi sýrasýnda kullanýlabilir"
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb sadece paket yükleme ve silmelerinde kullanýlýr"
-#: rpm.c:968
+#: rpm.c:966
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr "--noscripts sadece paket yükleme, silme ve dođrulamalarýnda kullanýlýr"
-#: rpm.c:972
+#: rpm.c:970
#, fuzzy
msgid "--apply may only be specified during package installation"
msgstr "--allfiles sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb sadece paket yükleme ve silmelerinde kullanýlýr"
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1097,13 +1092,13 @@ msgid ""
msgstr ""
"--nodeps sadece paket yüklemelerinde, silme ve dođrulamalarda kullanýlýr"
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test sadece paket yüklemelerinde, silme ve derlemelerinde kullanýlýr"
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1111,103 +1106,103 @@ msgstr ""
"--root (-r) sadece yükleme, silme, sorgulama ve veritabaný güncellemelerinde "
"kullanýlýr"
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) komutun argümanlarý '/' ile baţlamalý"
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage sadece güncelleme sýrasýnda kullanýlabilir"
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp sadece Ýmza kontrolü sýrasýnda kullanýlabilir"
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nopgp sadece Ýmza kontrolü sýrasýnda kullanýlabilir"
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
"--nopgp sadece imza kontrolü veya paket dođrulamasý sýrasýnda kullanýlýr"
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "%s dosyasý açýlamýyor: "
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
#, fuzzy
msgid "pgp not found: "
msgstr "Dosya sunucuda bulunamadý"
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr "Parola kontrolü baţarýsýzlýkla sonuçlandý\n"
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr "Parola dođru.\n"
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr "--sign sadece paket olusturulurken kullanýlabilir"
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Eriţilemedi\n"
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr "--querytags için beklenmeyen argümanlar"
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr "imzasý kontrol edilecek paketler belirtilmedi"
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr "imzalanacak paketler belirtilmedi"
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr "sistemden silinecek paketler belirtilmedi"
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr "yüklenecek paketler belirtilmedi"
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr "tüm paketlerin sorgulanmasý için fazladan argümanlar belirtildi"
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr "sorgulama için hiç argüman belirtilmedi"
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "tüm paketlerin sorgulanmasý için fazladan argümanlar belirtildi"
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr "dođrulama için hiç argüman belirtilmedi"
@@ -1651,6 +1646,11 @@ msgstr " -b<adým> <spec> "
msgid " --erase <package>"
msgstr "paket yüklemek"
+#: rpmqv.c:642
+#, fuzzy
+msgid " -e <package> "
+msgstr " -b<adým> <spec> "
+
#: rpmqv.c:660
#, fuzzy
msgid " --resign <pkg>+ "
@@ -2052,7 +2052,7 @@ msgstr "PGP-imzasý yaratýr"
msgid "Could not open %s: %s\n"
msgstr "%s 'ye eriţimde hata oluţtu\n"
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "%s 'nin yazýlmasý mümkün deđil"
@@ -2082,7 +2082,7 @@ msgstr "%s 'nin yazýlmasý mümkün deđil"
msgid "Unable to write payload to %s: %s\n"
msgstr "%s 'nin yazýlmasý mümkün deđil"
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2518,11 +2518,11 @@ msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur"
msgid "cannot get %s lock on database\n"
msgstr "Veritabaný için %s kilit (lock) alýnamadý"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr "özel"
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr "paylaţýlan (shared)"
@@ -2551,12 +2551,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur"
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, fuzzy, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr "Veritabaný için %s kilit (lock) alýnamadý"
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2582,104 +2582,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
-#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
-msgstr ""
+#: lib/depends.c:1071
+#, fuzzy, c-format
+msgid "%s: %-45s %-s (cached)\n"
+msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, fuzzy, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, fuzzy, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, fuzzy, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, fuzzy, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr "%s paketi %s altýnda gözükmüyor"
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, fuzzy, c-format
msgid "package %s conflicts: %s\n"
msgstr "%s paketi %s altýnda gözükmüyor"
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, fuzzy, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2693,8 +2702,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr "(üye deđil)"
@@ -2736,32 +2745,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr "%s açýlamadý: %s"
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "%s dosyasý açýlamýyor: "
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s silinemedi - belirtilen dizin boţ deđil"
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s dizinin silinmesinde belirtilen hata oluţtu: %s"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s 'ye erisimde belirtilen hata oluţtu: %s\n"
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "%s dosyasý açýlamýyor: "
@@ -2771,94 +2780,94 @@ msgstr "%s dosyasý açýlamýyor: "
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr "% den sonra eksik {"
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr "%{ den sonra eksik }"
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr "boţ tag tanýmlamasý"
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr "boţ tag ismi"
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr "bilinmeyen tag"
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr "dizinin sonunda ] bekleniyordu"
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr "beklenmeyen ]"
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr "beklenmeyen }"
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr "dizi içerisinde ? bekleniyordu"
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
#, fuzzy
msgid "{ expected after ? in expression"
msgstr "dizi içerisinde ? den sonra { bekleniyordu"
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr "dizi içerisinde } bekleniyordu"
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr "? altdizisinden sonra : bekleniyordu"
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
#, fuzzy
msgid "{ expected after : in expression"
msgstr "dizide : den sonra { bekleniyordu"
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr "dizinin sonunda | bekleniyordu"
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr "(bilinmeyen tip)"
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, fuzzy, c-format
msgid "error creating temporary file %s\n"
msgstr "%s dizinin oluţturulmasýnda hata: %s"
@@ -2869,7 +2878,7 @@ msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"RPM'in bu sürümünde sadece major numarasý <= 3 olan paketler destekleniyor"
-#: lib/package.c:179
+#: lib/package.c:181
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
@@ -3123,245 +3132,244 @@ msgstr ", %s-%s-%s tarafýndan kullanýlýyor\n"
msgid " conflicts with %s-%s-%s\n"
msgstr ", %s-%s-%s ile çeliţiyor\n"
-#: lib/problems.c:99
+#: lib/problems.c:118
#, fuzzy, c-format
msgid "package %s is for a different architecture"
msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
-#: lib/problems.c:103
+#: lib/problems.c:122
#, fuzzy, c-format
msgid "package %s is for a different operating system"
msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
-#: lib/problems.c:107
+#: lib/problems.c:126
#, fuzzy, c-format
msgid "package %s is already installed"
msgstr "%s pakedi yüklenmemiţ\n"
-#: lib/problems.c:111
+#: lib/problems.c:130
#, fuzzy, c-format
msgid "path %s in package %s is not relocateable"
msgstr "%s pakedi yüklenmemiţ\n"
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, fuzzy, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ", %s-%s-%s ile çeliţiyor\n"
-#: lib/problems.c:126
+#: lib/problems.c:145
#, fuzzy, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, fuzzy, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, fuzzy, c-format
msgid "cannot create %s %s\n"
msgstr "%s dosyasý açýlamýyor: "
-#: lib/psm.c:570
+#: lib/psm.c:571
#, fuzzy, c-format
msgid "cannot write to %s\n"
msgstr "%s dosyasý açýlamýyor: "
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: lib/psm.c:954
+#: lib/psm.c:955
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr "betik (script) çalýţtýrýlamadý "
-#: lib/psm.c:961
+#: lib/psm.c:962
#, fuzzy, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr "betik (script) çalýţtýrýlamadý "
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, fuzzy, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, fuzzy, c-format
msgid "group %s does not exist - using root\n"
msgstr "%s grubu hiç paket içermiyor\n"
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "%s 'ye erisimde belirtilen hata oluţtu: %s\n"
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, fuzzy, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr "adýmlarýn hiçbirini çalýţtýrmaz"
-#: lib/query.c:167
+#: lib/query.c:121
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "format hatasý: %s\n"
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr "(hiç dosya içermiyor)"
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
#, fuzzy
msgid "not installed "
msgstr "%s pakedi yüklenmemiţ\n"
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, fuzzy, c-format
msgid "(unknown %3d) "
msgstr "(bilinmeyen tip)"
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
#, fuzzy
msgid "package has neither file owner or id lists\n"
msgstr "pakedin adý yok :-)"
-#: lib/query.c:438
+#: lib/query.c:392
#, fuzzy, c-format
msgid "can't query %s: %s\n"
msgstr "hata: %s eriţilemiyor\n"
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "%s 'ye erisimde belirtilen hata oluţtu: %s\n"
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
-msgstr "eski tip kaynak paketleri sorgulanamýyor\n"
-
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
-msgstr "%s bir RPM paketi deđil (gibi)\n"
-
-#: lib/query.c:590
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr "%s 'nin sorgulamasý baţarýsýzlýkla sonuçlandý\n"
-#: lib/query.c:624
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
+msgstr "eski tip kaynak paketleri sorgulanamýyor\n"
+
+#: lib/query.c:556 lib/rpminstall.c:458
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: 'readLead' hata verdi\n"
+
+#: lib/query.c:599
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "%s 'nin sorgulamasý baţarýsýzlýkla sonuçlandý\n"
-#: lib/query.c:647
+#: lib/query.c:622
#, fuzzy
msgid "no packages\n"
msgstr "Tüm paketleri sorgulama"
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "%s grubu hiç paket içermiyor\n"
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr "hiç bir paket %s tetiklemiyor\n"
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr "hiç bir paket %s gerektirmiyor\n"
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr "hiç bir paket %s sađlamýyor\n"
-#: lib/query.c:720
+#: lib/query.c:695
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "%s açýlamadý: %s"
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr "geçersiz paket numarsý: %s\n"
-#: lib/query.c:753
+#: lib/query.c:728
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "geçersiz paket numarsý: %s\n"
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr "%d numaralý kayýt okunamadý\n"
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr "%s pakedi yüklenmemiţ\n"
@@ -3600,121 +3608,96 @@ msgstr "%s dizinin oluţturulmasýnda hata: %s"
msgid "failed to remove directory %s: %s\n"
msgstr "%s açýlamadý: %s"
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "yüklenecek paketler belirtilmedi"
-#: lib/rpminstall.c:210
-#, fuzzy
-msgid "counting packages to install\n"
-msgstr "yüklenecek paketler belirtilmedi"
-
-#: lib/rpminstall.c:214
-#, fuzzy, c-format
-msgid "found %d packages\n"
-msgstr "Tüm paketleri sorgulama"
-
-#: lib/rpminstall.c:219
-#, fuzzy
-msgid "looking for packages to download\n"
-msgstr "%s pakedi aranýrken hata oluţtu\n"
-
-#: lib/rpminstall.c:234
-#, 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:249
+#: lib/rpminstall.c:270
#, 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:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, 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:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, fuzzy, c-format
-msgid "cannot open file %s: %s\n"
-msgstr "%s dosyasý açýlamýyor: "
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, fuzzy, c-format
-msgid "%s cannot be installed\n"
-msgstr "hata: %s yüklenemedi\n"
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "%s pakedi yüklenmemiţ\n"
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "%s dizinin oluţturulmasýnda hata: %s"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, fuzzy, c-format
+msgid "%s cannot be installed\n"
+msgstr "hata: %s yüklenemedi\n"
+
+#: lib/rpminstall.c:472
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%s grubu hiç paket içermiyor\n"
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr "bađýmlýlýk hatasý, aţađýdaki paketlere ihtiyacýnýz var:\n"
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
#, fuzzy
msgid "installing binary packages\n"
msgstr "paket yüklemek"
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, fuzzy, c-format
+msgid "cannot open file %s: %s\n"
+msgstr "%s dosyasý açýlamýyor: "
+
+#: lib/rpminstall.c:580
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" birden fazla paketi tanýmlýyor\n"
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr "bu paketin silinmesi aţađýdaki bađýmlýlýklarý etkileyecektir:\n"
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "hata: %s eriţilemiyor\n"
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr "%s yükleniyor\n"
@@ -3953,50 +3936,50 @@ msgstr "rpmrc dosyanýzda \"pgp_name:\" tanýmlanmýţ olmalý"
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "rpmrc dosyanýzda \"pgp_name:\" tanýmlanmýţ olmalý"
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, fuzzy, c-format
msgid "%5d exclude %s\n"
msgstr "%s alýnýyor\n"
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, fuzzy, c-format
msgid "%5d relocate %s -> %s\n"
msgstr "%s dosyasý açýlamýyor: "
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, fuzzy, c-format
msgid "excluding multilib path %s%s\n"
msgstr "%s alýnýyor\n"
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, fuzzy, c-format
msgid "excluding %s %s\n"
msgstr "%s alýnýyor\n"
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "%s dizinin oluţturulmasýnda hata: %s"
-#: lib/transaction.c:617
-#, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "%s dizinin oluţturulmasýnda hata: %s"
-
-#: lib/transaction.c:741
+#: lib/transaction.c:771
#, c-format
msgid "%s skipped due to missingok flag\n"
msgstr ""
+#: lib/transaction.c:1359
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "%s dizinin oluţturulmasýnda hata: %s"
+
#: lib/verify.c:61
#, fuzzy
msgid "don't verify files in package"
@@ -4007,20 +3990,20 @@ msgstr "paket yüklemek"
msgid "do not execute %verifyscript (if any)"
msgstr "adýmlarýn hiçbirini çalýţtýrmaz"
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, fuzzy, c-format
msgid "missing %s"
msgstr "% den sonra eksik {"
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr "%s-%s-%s 'nin bađýmlýlýk sorunlarý: "
@@ -4236,6 +4219,33 @@ msgid "failed to create %s: %s\n"
msgstr "%s yaratýlamýyor\n"
#, fuzzy
+#~ msgid " --timecheck <secs> "
+#~ msgstr " -b<adým> <spec> "
+
+#, fuzzy
+#~ msgid "set the time check to <secs> seconds (0 disables)"
+#~ msgstr "zaman kontrolünü S saniyeye ayarlar (0 ile tümüyle kaldýrýr)"
+
+#~ msgid "%s does not appear to be a RPM package\n"
+#~ msgstr "%s bir RPM paketi deđil (gibi)\n"
+
+#, fuzzy
+#~ msgid "counting packages to install\n"
+#~ msgstr "yüklenecek paketler belirtilmedi"
+
+#, fuzzy
+#~ msgid "found %d packages\n"
+#~ msgstr "Tüm paketleri sorgulama"
+
+#, fuzzy
+#~ msgid "looking for packages to download\n"
+#~ msgstr "%s pakedi aranýrken hata oluţtu\n"
+
+#, fuzzy
+#~ msgid "skipping %s - rpmGlob failed(%d)\n"
+#~ msgstr "hata: %s atlanýyor - aktarým baţarýsýz - %s\n"
+
+#, fuzzy
#~ msgid ""
#~ "--notriggers may only be specified during package installation, erasure, and "
#~ "verification"
@@ -4524,10 +4534,6 @@ msgstr "%s yaratýlamýyor\n"
#~ " rpm {--recompile} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
#, fuzzy
-#~ msgid " -K <pkg>+ "
-#~ msgstr " -b<adým> <spec> "
-
-#, fuzzy
#~ msgid "line %d: Version not permitted: %s"
#~ msgstr "%s paketi %s altýnda gözükmüyor"
diff --git a/po/uk.po b/po/uk.po
index 7d139b2ee..0dc8b948b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -646,6 +646,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -737,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1467,6 +1463,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2303,11 +2303,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2336,12 +2336,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2367,104 +2367,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2478,8 +2487,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2521,32 +2530,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2556,92 +2565,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2650,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2869,241 +2878,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3339,117 +3347,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3672,48 +3657,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3724,20 +3709,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 7d139b2ee..0dc8b948b 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -646,6 +646,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -737,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1467,6 +1463,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2303,11 +2303,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2336,12 +2336,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2367,104 +2367,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2478,8 +2487,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2521,32 +2530,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2556,92 +2565,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2650,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2869,241 +2878,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3339,117 +3347,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3672,48 +3657,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3724,20 +3709,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 7d139b2ee..0dc8b948b 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -646,6 +646,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -737,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1467,6 +1463,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2303,11 +2303,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2336,12 +2336,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2367,104 +2367,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2478,8 +2487,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2521,32 +2530,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2556,92 +2565,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2650,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2869,241 +2878,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3339,117 +3347,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3672,48 +3657,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3724,20 +3709,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 7d139b2ee..0dc8b948b 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.1\n"
-"POT-Creation-Date: 2001-03-16 11:04-0500\n"
+"POT-Creation-Date: 2001-04-23 16:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,11 +375,11 @@ msgstr ""
msgid "query mode"
msgstr ""
-#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:562
+#: rpm.c:365 rpm.c:411 rpm.c:436 rpm.c:488 rpm.c:560
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:563 rpmqv.c:496
+#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:496
msgid "use <dir> as the directory for the database"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid " --root <dir> "
msgstr ""
-#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:565 rpmqv.c:144 rpmqv.c:498
+#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:498
msgid "use <dir> as the top level directory"
msgstr ""
@@ -646,6 +646,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpm.c:484
+msgid " -e <package> "
+msgstr ""
+
#: rpm.c:485 rpmqv.c:240 rpmqv.c:643
msgid "erase (uninstall) package"
msgstr ""
@@ -737,353 +741,345 @@ msgstr ""
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:534
-msgid " --timecheck <secs> "
-msgstr ""
-
#: rpm.c:535
-msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
-
-#: rpm.c:537
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:538
+#: rpm.c:536
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:539
+#: rpm.c:537
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:540
+#: rpm.c:538
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:543
+#: rpm.c:541
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:544 rpmqv.c:198 rpmqv.c:661
+#: rpm.c:542 rpmqv.c:198 rpmqv.c:661
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:545
+#: rpm.c:543
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:546 rpmqv.c:196 rpmqv.c:663
+#: rpm.c:544 rpmqv.c:196 rpmqv.c:663
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:547
+#: rpm.c:545
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:548
+#: rpm.c:546
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:549 rpmqv.c:202 rpmqv.c:667
+#: rpm.c:547 rpmqv.c:202 rpmqv.c:667
msgid "verify package signature"
msgstr ""
-#: rpm.c:551 rpmqv.c:204 rpmqv.c:669
+#: rpm.c:549 rpmqv.c:204 rpmqv.c:669
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:553 rpmqv.c:206 rpmqv.c:671
+#: rpm.c:551 rpmqv.c:206 rpmqv.c:671
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:555 rpmqv.c:673
+#: rpm.c:553 rpmqv.c:673
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:559
+#: rpm.c:557
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:561
+#: rpm.c:559
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:569 rpmqv.c:578
+#: rpm.c:567 rpmqv.c:578
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:572 rpmqv.c:581
+#: rpm.c:570 rpmqv.c:581
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:724 rpm.c:730 rpm.c:739 rpm.c:761 rpm.c:767 rpm.c:774 rpm.c:782
-#: rpm.c:790 rpm.c:811 rpm.c:874 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
+#: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780
+#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:866 rpmqv.c:872 rpmqv.c:879
#: rpmqv.c:885 rpmqv.c:919 rpmqv.c:927 rpmqv.c:933 rpmqv.c:941 rpmqv.c:1008
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:732
+#: rpm.c:730
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:734
+#: rpm.c:732
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:817 rpmqv.c:903
+#: rpm.c:815 rpmqv.c:903
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:819 rpmqv.c:905
+#: rpm.c:817 rpmqv.c:905
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:822 rpmqv.c:908
+#: rpm.c:820 rpmqv.c:908
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:831 rpmqv.c:892
+#: rpm.c:829 rpmqv.c:892
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:840 rpmqv.c:962
+#: rpm.c:838 rpmqv.c:962
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpm.c:841
+#: rpm.c:839
msgid "Use --macros with a colon separated list of macro files to read.\n"
msgstr ""
-#: rpm.c:846 rpmqv.c:968
+#: rpm.c:844 rpmqv.c:968
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:881 rpmqv.c:1023
+#: rpm.c:879 rpmqv.c:1023
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:886 rpmqv.c:1027
+#: rpm.c:884 rpmqv.c:1027
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:889 rpmqv.c:1030
+#: rpm.c:887 rpmqv.c:1030
msgid "unexpected query format"
msgstr ""
-#: rpm.c:892 rpmqv.c:1033
+#: rpm.c:890 rpmqv.c:1033
msgid "unexpected query source"
msgstr ""
-#: rpm.c:895 rpmqv.c:1043
+#: rpm.c:893 rpmqv.c:1043
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:898 rpmqv.c:1048
+#: rpm.c:896 rpmqv.c:1048
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:901 rpmqv.c:1051
+#: rpm.c:899 rpmqv.c:1051
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:904 rpmqv.c:1054
+#: rpm.c:902 rpmqv.c:1054
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:907 rpmqv.c:1057
+#: rpm.c:905 rpmqv.c:1057
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:910 rpmqv.c:1060
+#: rpm.c:908 rpmqv.c:1060
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:913 rpmqv.c:1063
+#: rpm.c:911 rpmqv.c:1063
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:917 rpmqv.c:1067
+#: rpm.c:915 rpmqv.c:1067
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:921 rpmqv.c:1072
+#: rpm.c:919 rpmqv.c:1072
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:925 rpmqv.c:1076
+#: rpm.c:923 rpmqv.c:1076
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:929 rpmqv.c:1080
+#: rpm.c:927 rpmqv.c:1080
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:933 rpmqv.c:1084
+#: rpm.c:931 rpmqv.c:1084
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:937 rpmqv.c:1088
+#: rpm.c:935 rpmqv.c:1088
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:941 rpmqv.c:1092
+#: rpm.c:939 rpmqv.c:1092
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:945 rpmqv.c:1096
+#: rpm.c:943 rpmqv.c:1096
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:949 rpmqv.c:1101
+#: rpm.c:947 rpmqv.c:1101
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:953 rpmqv.c:1105
+#: rpm.c:951 rpmqv.c:1105
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:957 rpmqv.c:1109
+#: rpm.c:955 rpmqv.c:1109
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:961 rpmqv.c:1114
+#: rpm.c:959 rpmqv.c:1114
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:968
+#: rpm.c:966
msgid ""
"script disabling options may only be specified during package installation, "
"erasure, and verification"
msgstr ""
-#: rpm.c:972
+#: rpm.c:970
msgid "--apply may only be specified during package installation"
msgstr ""
-#: rpm.c:977 rpmqv.c:1126
+#: rpm.c:975 rpmqv.c:1126
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpm.c:981 rpmqv.c:1130
+#: rpm.c:979 rpmqv.c:1130
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:986 rpmqv.c:1135
+#: rpm.c:984 rpmqv.c:1135
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:990 rpmqv.c:1140
+#: rpm.c:988 rpmqv.c:1140
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:1002 rpmqv.c:1152
+#: rpm.c:1000 rpmqv.c:1152
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:1008
+#: rpm.c:1006
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:1011 rpmqv.c:1159
+#: rpm.c:1009 rpmqv.c:1159
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1162
+#: rpm.c:1012 rpmqv.c:1162
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:1017 rpmqv.c:1167
+#: rpm.c:1015 rpmqv.c:1167
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1183
+#: rpm.c:1026 rpmqv.c:1183
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:1033 rpmqv.c:1188
+#: rpm.c:1031 rpmqv.c:1188
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1048 rpmqv.c:1204
+#: rpm.c:1046 rpmqv.c:1204
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1052 rpmqv.c:1208
+#: rpm.c:1050 rpmqv.c:1208
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1054 rpmqv.c:1210
+#: rpm.c:1052 rpmqv.c:1210
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1057 rpmqv.c:1213
+#: rpm.c:1055 rpmqv.c:1213
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1062 rpmqv.c:1218
+#: rpm.c:1060 rpmqv.c:1218
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1224
+#: rpm.c:1066 rpmqv.c:1224
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1083 rpmqv.c:1240
+#: rpm.c:1081 rpmqv.c:1240
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1102 rpmqv.c:1484
+#: rpm.c:1100 rpmqv.c:1484
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1113 rpmqv.c:1506
+#: rpm.c:1111 rpmqv.c:1506
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1124 rpmqv.c:1517
+#: rpm.c:1122 rpmqv.c:1517
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1140 rpmqv.c:1380
+#: rpm.c:1138 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1229 rpmqv.c:1409
+#: rpm.c:1227 rpmqv.c:1409
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1253 rpmqv.c:1450
+#: rpm.c:1251 rpmqv.c:1450
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1258 rpmqv.c:1455
+#: rpm.c:1256 rpmqv.c:1455
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1275 rpmqv.c:1472
+#: rpm.c:1273 rpmqv.c:1472
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1279 rpmqv.c:1476
+#: rpm.c:1277 rpmqv.c:1476
msgid "no arguments given for verify"
msgstr ""
@@ -1467,6 +1463,10 @@ msgstr ""
msgid " --erase <package>"
msgstr ""
+#: rpmqv.c:642
+msgid " -e <package> "
+msgstr ""
+
#: rpmqv.c:660
msgid " --resign <pkg>+ "
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:489 lib/psm.c:1447
+#: build/pack.c:489 lib/psm.c:1448
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Unable to write payload to %s: %s\n"
msgstr ""
-#: build/pack.c:571 lib/psm.c:1683
+#: build/pack.c:571 lib/psm.c:1684
#, c-format
msgid "Wrote: %s\n"
msgstr ""
@@ -2303,11 +2303,11 @@ msgstr ""
msgid "cannot get %s lock on database\n"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "exclusive"
msgstr ""
-#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:766
+#: lib/db1.c:450 lib/db2.c:786 lib/db3.c:771
msgid "shared"
msgstr ""
@@ -2336,12 +2336,12 @@ msgstr ""
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db2.c:784 lib/db3.c:764
+#: lib/db2.c:784 lib/db3.c:769
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db2.c:791 lib/db3.c:771
+#: lib/db2.c:791 lib/db3.c:776
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2367,104 +2367,113 @@ msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
#. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:565
+#: lib/depends.c:571
#, c-format
msgid ""
"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
"\tA %s\tB %s\n"
msgstr ""
-#: lib/depends.c:594
+#: lib/depends.c:600
#, c-format
msgid " %s A %s\tB %s\n"
msgstr ""
-#: lib/depends.c:962
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "YES"
+msgstr ""
+
+#: lib/depends.c:601 lib/depends.c:1072 lib/depends.c:1193
+msgid "NO "
+msgstr ""
+
+#: lib/depends.c:960
#, c-format
msgid "%s: %-45s YES (added files)\n"
msgstr ""
-#: lib/depends.c:1021
+#: lib/depends.c:1019
#, c-format
msgid "%s: %-45s YES (added provide)\n"
msgstr ""
-#: lib/depends.c:1073
+#: lib/depends.c:1071
#, c-format
-msgid "%s: %-45s %-3s (cached)\n"
+msgid "%s: %-45s %-s (cached)\n"
msgstr ""
-#: lib/depends.c:1092
+#: lib/depends.c:1090
#, c-format
msgid "%s: %-45s YES (rpmrc provides)\n"
msgstr ""
-#: lib/depends.c:1109
+#: lib/depends.c:1107
#, c-format
msgid "%s: %-45s YES (rpmlib provides)\n"
msgstr ""
-#: lib/depends.c:1131
+#: lib/depends.c:1129
#, c-format
msgid "%s: %-45s YES (db files)\n"
msgstr ""
-#: lib/depends.c:1144
+#: lib/depends.c:1142
#, c-format
msgid "%s: %-45s YES (db provides)\n"
msgstr ""
-#: lib/depends.c:1158
+#: lib/depends.c:1156
#, c-format
msgid "%s: %-45s YES (db package)\n"
msgstr ""
-#: lib/depends.c:1174
+#: lib/depends.c:1172
#, c-format
msgid "%s: %-45s NO\n"
msgstr ""
-#: lib/depends.c:1195
+#: lib/depends.c:1193
#, c-format
msgid "%s: (%s, %s) added to Depends cache.\n"
msgstr ""
#. requirements are not satisfied.
-#: lib/depends.c:1256
+#: lib/depends.c:1255
#, c-format
msgid "package %s-%s-%s require not satisfied: %s\n"
msgstr ""
#. conflicts exist.
-#: lib/depends.c:1323
+#: lib/depends.c:1322
#, c-format
msgid "package %s conflicts: %s\n"
msgstr ""
-#: lib/depends.c:1538
+#: lib/depends.c:1536
#, c-format
msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1677
+#: lib/depends.c:1679
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1724
-msgid "========== tsorting packages\n"
+#: lib/depends.c:1731
+msgid ""
+"========== tsorting packages (order, #predecessors, #succesors, depth)\n"
msgstr ""
-#: lib/depends.c:1769
+#: lib/depends.c:1778
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1818
+#: lib/depends.c:1827
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1849
+#: lib/depends.c:1855
msgid "========== continuing tsort ...\n"
msgstr ""
@@ -2478,8 +2487,8 @@ msgid ""
"if \"rpm --rebuilddb\" fails to correct the problem.\n"
msgstr ""
-#: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2597 lib/header.c:2614 lib/header.c:2634
+#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124
+#: lib/header.c:2625 lib/header.c:2642 lib/header.c:2662
msgid "(not a number)"
msgstr ""
@@ -2521,32 +2530,32 @@ msgstr ""
msgid "%9d %s\n"
msgstr ""
-#: lib/fsm.c:1041
+#: lib/fsm.c:1040
#, c-format
msgid "%s directory created with perms %04o.\n"
msgstr ""
-#: lib/fsm.c:1343 lib/fsm.c:1460
+#: lib/fsm.c:1342 lib/fsm.c:1459
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1485
+#: lib/fsm.c:1484
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1490
+#: lib/fsm.c:1489
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1498
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1516
+#: lib/fsm.c:1515
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -2556,92 +2565,92 @@ msgstr ""
msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
msgstr ""
-#: lib/header.c:207 lib/header.c:1082 lib/psm.c:377
+#: lib/header.c:207 lib/header.c:1110 lib/psm.c:378
#, c-format
msgid "Data type %d not supported\n"
msgstr ""
-#: lib/header.c:1505
+#: lib/header.c:1533
#, c-format
msgid "Bad count for headerAddEntry(): %d\n"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1950
+#: lib/header.c:1978
#, c-format
msgid "missing { after %"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2008
msgid "missing } after %{"
msgstr ""
#. @-observertrans@
-#: lib/header.c:1994
+#: lib/header.c:2022
msgid "empty tag format"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2006
+#: lib/header.c:2034
msgid "empty tag name"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2023
+#: lib/header.c:2051
msgid "unknown tag"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2050
+#: lib/header.c:2078
msgid "] expected at end of array"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2068
+#: lib/header.c:2096
msgid "unexpected ]"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2072
+#: lib/header.c:2100
msgid "unexpected }"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2132
+#: lib/header.c:2160
msgid "? expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2141
+#: lib/header.c:2169
msgid "{ expected after ? in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2154 lib/header.c:2195
+#: lib/header.c:2182 lib/header.c:2223
msgid "} expected in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2164
+#: lib/header.c:2192
msgid ": expected following ? subexpression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2180
+#: lib/header.c:2208
msgid "{ expected after : in expression"
msgstr ""
#. @-observertrans@
-#: lib/header.c:2205
+#: lib/header.c:2233
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2376
+#: lib/header.c:2404
msgid "(unknown type)"
msgstr ""
-#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
+#: lib/misc.c:338 lib/misc.c:343 lib/misc.c:349
#, c-format
msgid "error creating temporary file %s\n"
msgstr ""
@@ -2650,7 +2659,7 @@ msgstr ""
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:179
+#: lib/package.c:181
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
@@ -2869,241 +2878,240 @@ msgstr ""
msgid " conflicts with %s-%s-%s\n"
msgstr ""
-#: lib/problems.c:99
+#: lib/problems.c:118
#, c-format
msgid "package %s is for a different architecture"
msgstr ""
-#: lib/problems.c:103
+#: lib/problems.c:122
#, c-format
msgid "package %s is for a different operating system"
msgstr ""
-#: lib/problems.c:107
+#: lib/problems.c:126
#, c-format
msgid "package %s is already installed"
msgstr ""
-#: lib/problems.c:111
+#: lib/problems.c:130
#, c-format
msgid "path %s in package %s is not relocateable"
msgstr ""
-#: lib/problems.c:116
+#: lib/problems.c:135
#, c-format
msgid "file %s conflicts between attempted installs of %s and %s"
msgstr ""
-#: lib/problems.c:121
+#: lib/problems.c:140
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
msgstr ""
-#: lib/problems.c:126
+#: lib/problems.c:145
#, c-format
msgid "package %s (which is newer than %s) is already installed"
msgstr ""
-#: lib/problems.c:131
+#: lib/problems.c:150
#, c-format
msgid "installing package %s needs %ld%cb on the %s filesystem"
msgstr ""
-#: lib/problems.c:141
+#: lib/problems.c:160
#, c-format
msgid "installing package %s needs %ld inodes on the %s filesystem"
msgstr ""
-#: lib/problems.c:146
+#: lib/problems.c:165
#, c-format
msgid "package %s pre-transaction syscall(s): %s failed: %s"
msgstr ""
-#: lib/problems.c:153
+#: lib/problems.c:172
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
-#: lib/psm.c:564
+#: lib/psm.c:565
#, c-format
msgid "cannot create %s %s\n"
msgstr ""
-#: lib/psm.c:570
+#: lib/psm.c:571
#, c-format
msgid "cannot write to %s\n"
msgstr ""
-#: lib/psm.c:604
+#: lib/psm.c:605
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:706
+#: lib/psm.c:707
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:954
+#: lib/psm.c:955
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
msgstr ""
-#: lib/psm.c:961
+#: lib/psm.c:962
#, c-format
msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1265
+#: lib/psm.c:1266
#, c-format
msgid "%s: %s-%s-%s has %d files, test = %d\n"
msgstr ""
-#: lib/psm.c:1378
+#: lib/psm.c:1379
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
msgstr ""
-#: lib/psm.c:1484
+#: lib/psm.c:1485
#, c-format
msgid "user %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1493
+#: lib/psm.c:1494
#, c-format
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/psm.c:1522
+#: lib/psm.c:1523
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1523
+#: lib/psm.c:1524
msgid " on file "
msgstr ""
-#: lib/psm.c:1774
+#: lib/psm.c:1775
#, c-format
msgid "%s: running %s script(s) (if any)\n"
msgstr ""
-#: lib/query.c:167
+#: lib/query.c:121
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
-#: lib/query.c:251
+#: lib/query.c:205
msgid "(contains no files)"
msgstr ""
-#: lib/query.c:302
+#: lib/query.c:256
msgid "normal "
msgstr ""
-#: lib/query.c:304
+#: lib/query.c:258
msgid "replaced "
msgstr ""
-#: lib/query.c:306
+#: lib/query.c:260
msgid "not installed "
msgstr ""
-#: lib/query.c:308
+#: lib/query.c:262
msgid "net shared "
msgstr ""
-#: lib/query.c:310
+#: lib/query.c:264
#, c-format
msgid "(unknown %3d) "
msgstr ""
-#: lib/query.c:315
+#: lib/query.c:269
msgid "(no state) "
msgstr ""
-#: lib/query.c:334 lib/query.c:379
+#: lib/query.c:288 lib/query.c:333
msgid "package has neither file owner or id lists\n"
msgstr ""
-#: lib/query.c:438
+#: lib/query.c:392
#, c-format
msgid "can't query %s: %s\n"
msgstr ""
-#. XXX Fstrerror
-#: lib/query.c:555
+#: lib/query.c:514 lib/query.c:546 lib/rpminstall.c:319 lib/rpminstall.c:448
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:576
-msgid "old format source packages cannot be queried\n"
+#: lib/query.c:525
+#, c-format
+msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:585 lib/rpminstall.c:320
-#, c-format
-msgid "%s does not appear to be a RPM package\n"
+#: lib/query.c:531
+msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:556 lib/rpminstall.c:458
#, c-format
-msgid "query of %s failed\n"
+msgid "%s: read manifest failed: %s\n"
msgstr ""
-#: lib/query.c:624
+#: lib/query.c:599
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:647
+#: lib/query.c:622
msgid "no packages\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:633
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:643
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:678
+#: lib/query.c:653
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:689
+#: lib/query.c:664
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:720
+#: lib/query.c:695
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:724
+#: lib/query.c:699
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:750
+#: lib/query.c:725
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:753
+#: lib/query.c:728
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:758
+#: lib/query.c:733
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:769 lib/rpminstall.c:566
+#: lib/query.c:744 lib/rpminstall.c:593
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3339,117 +3347,94 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:149
+#: lib/rpminstall.c:162
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:151
+#: lib/rpminstall.c:164
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:210
-msgid "counting packages to install\n"
-msgstr ""
-
-#: lib/rpminstall.c:214
-#, c-format
-msgid "found %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:219
-msgid "looking for packages to download\n"
-msgstr ""
-
-#: lib/rpminstall.c:234
-#, c-format
-msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr ""
-
-#: lib/rpminstall.c:249
+#: lib/rpminstall.c:270
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:280
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:284
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:290
-#, c-format
-msgid "retrieved %d packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:306 lib/rpminstall.c:487
-#, c-format
-msgid "cannot open file %s: %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:328 lib/rpminstall.c:634
-#, c-format
-msgid "%s cannot be installed\n"
-msgstr ""
-
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:353
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:366
+#: lib/rpminstall.c:375
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:411
+#: lib/rpminstall.c:422
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:428
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:433
+#: lib/rpminstall.c:440 lib/rpminstall.c:661
+#, c-format
+msgid "%s cannot be installed\n"
+msgstr ""
+
+#: lib/rpminstall.c:472
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:446
+#: lib/rpminstall.c:487
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:508
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:553
+#: lib/rpminstall.c:526
+#, c-format
+msgid "cannot open file %s: %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:580
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
-#: lib/rpminstall.c:569
+#: lib/rpminstall.c:596
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:592
+#: lib/rpminstall.c:619
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:648
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:654
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3672,48 +3657,48 @@ msgstr ""
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
-#: lib/transaction.c:404
+#: lib/transaction.c:420
msgid "========== relocations\n"
msgstr ""
-#: lib/transaction.c:407
+#: lib/transaction.c:423
#, c-format
msgid "%5d exclude %s\n"
msgstr ""
-#: lib/transaction.c:410
+#: lib/transaction.c:426
#, c-format
msgid "%5d relocate %s -> %s\n"
msgstr ""
-#: lib/transaction.c:484
+#: lib/transaction.c:495
#, c-format
msgid "excluding multilib path %s%s\n"
msgstr ""
-#: lib/transaction.c:533
+#: lib/transaction.c:557
#, c-format
msgid "excluding %s %s\n"
msgstr ""
-#: lib/transaction.c:540
+#: lib/transaction.c:567
#, c-format
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/transaction.c:612
+#: lib/transaction.c:642
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
-#: lib/transaction.c:617
+#: lib/transaction.c:771
#, c-format
-msgid "excluding directory %s\n"
+msgid "%s skipped due to missingok flag\n"
msgstr ""
-#: lib/transaction.c:741
+#: lib/transaction.c:1359
#, c-format
-msgid "%s skipped due to missingok flag\n"
+msgid "excluding directory %s\n"
msgstr ""
#: lib/verify.c:61
@@ -3724,20 +3709,20 @@ msgstr ""
msgid "do not execute %verifyscript (if any)"
msgstr ""
-#: lib/verify.c:253
+#: lib/verify.c:257
msgid "package lacks both user name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:271
+#: lib/verify.c:275
msgid "package lacks both group name and id lists (this should never happen)\n"
msgstr ""
-#: lib/verify.c:344
+#: lib/verify.c:348
#, c-format
msgid "missing %s"
msgstr ""
-#: lib/verify.c:425
+#: lib/verify.c:429
#, c-format
msgid "Unsatisfied dependencies for %s-%s-%s: "
msgstr ""