summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Doxyfile.in3
-rw-r--r--po/POTFILES.in3
-rw-r--r--po/cs.po179
-rw-r--r--po/da.po179
-rw-r--r--po/de.po176
-rw-r--r--po/es.po176
-rw-r--r--po/fi.po176
-rw-r--r--po/fr.po176
-rw-r--r--po/gl.po176
-rw-r--r--po/hu.po176
-rw-r--r--po/id.po176
-rw-r--r--po/is.po179
-rw-r--r--po/it.po176
-rw-r--r--po/ja.po181
-rw-r--r--po/ko.po176
-rw-r--r--po/no.po179
-rw-r--r--po/pl.po179
-rw-r--r--po/pt.po176
-rw-r--r--po/pt_BR.po176
-rw-r--r--po/ro.po176
-rw-r--r--po/rpm.pot34
-rw-r--r--po/ru.po179
-rw-r--r--po/sk.po179
-rw-r--r--po/sl.po181
-rw-r--r--po/sr.po176
-rw-r--r--po/sv.po179
-rw-r--r--po/tr.po176
-rw-r--r--po/uk.po176
-rw-r--r--po/wa.po176
-rw-r--r--po/zh.po176
-rw-r--r--po/zh_CN.GB2312.po176
-rw-r--r--rpmio/Makefile.am4
-rw-r--r--rpmio/messages.c94
-rw-r--r--rpmio/rpmerr.c56
-rw-r--r--rpmio/rpmerr.h163
-rw-r--r--rpmio/rpmmessages.h73
-rwxr-xr-xrpmqv.c5
37 files changed, 2554 insertions, 2843 deletions
diff --git a/Doxyfile.in b/Doxyfile.in
index cb05324ad..045c96e30 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -323,8 +323,7 @@ INPUT = \
./lib/uninstall.c \
./lib/verify.c \
./rpmio/macro.c \
- ./rpmio/messages.c \
- ./rpmio/rpmerr.c \
+ ./rpmio/rpmlog.c \
./rpmio/rpmerr.h \
./rpmio/rpmio.c \
./rpmio/rpmio.h \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3ec58c651..be5c3551b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -56,8 +56,7 @@ lib/uninstall.c
lib/verify.c
rpmio/rpmio.c
rpmio/macro.c
-rpmio/messages.c
+rpmio/rpmlog.c
rpmio/rpmmalloc.c
-rpmio/rpmerr.c
rpmio/ugid.c
rpmio/url.c
diff --git a/po/cs.po b/po/cs.po
index d8a4e884f..deb8f89ae 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-0400\n"
"PO-Revision-Date: 2000-08-08 22:37+0100\n"
"Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "chyba: nemohu otevřít %s/packages.rpm\n"
@@ -1074,39 +1074,39 @@ msgstr "--sign může být použit jen při sestavování balíčků"
msgid "exec failed\n"
msgstr "spuštění selhalo\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "neočekávané parametry pro --querytags "
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "ke kontrole podpisu nezadány žádné balíčky"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "k podepsání nezadány žádné balíčky"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "nezadány žádné balíčky pro odstranění"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "nezadány žádné balíčky pro instalaci"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "k dotazu na všechny balíčky zadány parametry navíc"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "k dotazu nezadány žádné parametry"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr "pro kontrolu všech balíčků zadány parametry navíc"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "pro kontrolu nezadány žádné balíčky"
@@ -1467,11 +1467,11 @@ msgstr "----notriggers může být použito jen při instalaci nebo mazání balíčků"
msgid "no packages files given for rebuild"
msgstr "ke znovusestavení nezadány žádné balíčky"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "pro sestavení nezadány žádné spec soubory"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "pro sestavení nezadány žádné tar soubory"
@@ -1840,7 +1840,7 @@ msgstr "Nemohu vygenerovat jméno souboru pro balíček %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "nemohu vytvořit %s: %s\n"
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr "řádek: %d: druhý %s"
@@ -1873,17 +1873,17 @@ msgstr "žádný popis v %%changelog"
msgid "line %d: Error parsing %%description: %s"
msgstr "řádek %d: Chyba při parsování %%description: %s"
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr "řádek %d: špatná volba %s: %s"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr "řádek %d: Příliš mnoho jmen: %s"
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr "řádek %d: Balíček neexistuje: %s"
@@ -1893,11 +1893,11 @@ msgstr "řádek %d: Balíček neexistuje: %s"
msgid "line %d: Second description"
msgstr "řádek %d: Druhé description"
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr "řádek %d: Chyba při parsování %%files: %s"
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr "řádek %d: Druhý %%files seznam"
@@ -1962,7 +1962,7 @@ msgstr "řádek %d: Prázdná značka: %s"
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "řádek %d: Nepřípustný znak '-' v %s: %s"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr "BuildRoot nemůže být \"/\": %s"
@@ -1992,22 +1992,22 @@ msgstr "řádek %d: Špatný formát BuildArchitecture: %s"
msgid "Internal error: Bogus tag %d"
msgstr "Interní chyba: Špatná značka: %d"
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr "špatná specifikace balíčku: %s"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr "Balíček již existuje: %s"
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr "řádek %d: Neznámá značka: %s"
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr "Spec soubor nemůže použít BuildRoot"
@@ -2067,7 +2067,7 @@ msgstr "Příliš mnoho patchů!"
msgid "line %d: Bad arg to %%patch: %s"
msgstr "řádek %d: Špatný parametr pro %%patch: %s"
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr "řádek %d: druhý %%prep"
@@ -2094,65 +2094,65 @@ msgstr "řádek %d: Jméno s verzí není dovoleno: %s"
msgid "line %d: Version required: %s"
msgstr "řádek %d: Vyžadována verze: %s"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr "řádek %d: spouště (triggery) musí mít --: %s"
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr "řádek %d: Chyba při parsování %s: %s"
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr "řádek %d: jméno skriptu musí začínat '/': %s"
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr "řádek %d: Druhý %s"
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr "řádek %d: %s"
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr "Nemohu otevřít %s: %s\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr "Neuzavřený %%if"
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr "%s:%d: parseExpressionBoolean vrátil %d"
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr "%s:%d: %%else bez počítečního if"
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr "%s:%d: %%endif bez počátečního if"
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr "poškozený příkaz %%include"
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr "Žádné architektury pro sestavení"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr "Balíček nemá žádné %%description: %s"
@@ -2613,39 +2613,39 @@ msgstr "zdrojový balíček neobsahuje spec soubor"
msgid "renaming %s to %s\n"
msgstr "přejmenovávám %s na %s\n"
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "přejmenování %s na %s selhalo: %s"
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr "očekávám balíček se zdrojovými kódy, nalezen však binární"
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "balíček: %s-%s-%s test souborů = %d\n"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr "ukončuji instalaci, protože je spuštěn --test\n"
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr "spouštím případný předinstalační skript\n"
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr "varování: %s vytvořeno jako %s"
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr "varování: %s uloženo jako %s"
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr "spouštím případný postinstalační skript\n"
@@ -2936,80 +2936,80 @@ msgid "can't query %s: %s\n"
msgstr "nemohu provést dotaz %s: %s\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otevření %s selhalo: %s\n"
-#: lib/query.c:515
+#: lib/query.c:514
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:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, 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:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr "dotaz na %s se nezdařil\n"
-#: lib/query.c:561
+#: lib/query.c:560
#, 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:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr "žádné balíčky\n"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s neobsahuje žádné balíčky\n"
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr "žádný balíček neaktivuje %s\n"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr "žádný balíček nevyžaduje %s\n"
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr "žádný balíček neposkytuje %s\n"
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr "soubor %s: %s\n"
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "soubor %s nevlastní žádný balíček\n"
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "neplatné číslo balíčku: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr "záznam balíčku číslo: %u\n"
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr "záznam %d nelze přečíst\n"
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr "balíček %s není nainstalován\n"
@@ -3312,104 +3312,104 @@ msgstr "mažu adresář %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "nemohu odstranit adresář %s: %s\n"
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr "počítám balíčky pro instalaci\n"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr "nalezeno %d balíčků\n"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr "hledám balíčky pro stažení\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "přeskakuji %s - rpmGlob selhal(%d)\n"
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr "Stahuji %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr " ... jako %s\n"
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "přeskakuji %s - přenos selhal - %s\n"
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr "přijato %d balíčků\n"
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "nemohu otevřít soubor %s: %s\n"
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nemůže být nainstalován\n"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nemohu otevřít databázi balíčků v %s\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr "balíček %s není přemístitelný\n"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr "chyba při čtení ze souboru %s\n"
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, 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:346
+#: lib/rpminstall.c:347
#, 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:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "nevyřešené závislosti:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr "instaluji binární balíčky\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" určuje více balíčků\n"
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "odstranění těchto balíčků by porušilo závislosti:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nemohu otevřít %s: %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "Instaluji %s\n"
@@ -3774,22 +3774,18 @@ msgstr "Soubor %s: %s"
msgid "File %s is smaller than %d bytes"
msgstr "Soubor %s je menší, než %d bajtů"
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "varování: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "chyba: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "fatální chyba: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr "interní chyba (chyba v rpm?): "
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3835,6 +3831,9 @@ msgstr "nemohu otevřít %s: %s\n"
msgid "failed to create %s: %s\n"
msgstr "nemohu vytvořit %s: %s\n"
+#~ msgid "internal error (rpm bug?): "
+#~ msgstr "interní chyba (chyba v rpm?): "
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "chybí druhá ':' u %s:%d"
diff --git a/po/da.po b/po/da.po
index a4694421a..5e1935ba4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "Kan ikke ĺbne %s/packages.rpm\n"
@@ -1048,39 +1048,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1439,11 +1439,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1812,7 +1812,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1845,17 +1845,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1865,11 +1865,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1934,7 +1934,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1964,22 +1964,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2039,7 +2039,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2064,65 +2064,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2577,39 +2577,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2900,80 +2900,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr "ingen pakker\n"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "ugyldig pakkenummer: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3250,104 +3250,104 @@ msgstr "fjener kataloget %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr "fundet %d pakke(r)\n"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr "leder efter pakker til at hente\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr "Modtager %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr "modtager %d pakker\n"
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kan ikke ĺbne fil %s: %s\n"
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "Kan ikke ĺbne %s/packages.rpm\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr "installerer binćre pakker\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke ĺbne %s: %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
@@ -3709,22 +3709,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "advarsel: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "fejl: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "fatal fejl: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr "intern fejl (rpm fejl?): "
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3770,6 +3766,9 @@ msgstr ""
msgid "failed to create %s: %s\n"
msgstr ""
+#~ msgid "internal error (rpm bug?): "
+#~ msgstr "intern fejl (rpm fejl?): "
+
#~ msgid "Cannot expand %s"
#~ msgstr "Kan ikke udvide %s"
diff --git a/po/de.po b/po/de.po
index a559667da..dfa75d300 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -45,7 +45,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
@@ -1188,40 +1188,40 @@ msgstr "--sign darf nur während der Paketerstellung benutzt werden"
msgid "exec failed\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "Unerwartete Argumente zu --querytags "
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "Es wurden keine Pakete für die Signaturüberprüfung angegeben"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "Es wurden keine Pakete für die Signatur angeben"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
@@ -1634,11 +1634,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
@@ -2034,7 +2034,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -2068,17 +2068,17 @@ msgid "line %d: Error parsing %%description: %s"
msgstr ""
# , c-format
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, fuzzy, c-format
msgid "line %d: Bad option %s: %s"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, fuzzy, c-format
msgid "line %d: Package does not exist: %s"
msgstr "Paket %s wird nicht in %s aufgeführt"
@@ -2088,11 +2088,11 @@ msgstr "Paket %s wird nicht in %s aufgeführt"
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -2160,7 +2160,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -2190,22 +2190,22 @@ msgstr "fehlende Architektur für %s bei %s:%d"
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, fuzzy, c-format
msgid "Bad package specification: %s"
msgstr " Optionen der Paketauswahl:"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2267,7 +2267,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2293,68 +2293,68 @@ msgstr "Paket %s wird nicht in %s aufgeführt"
msgid "line %d: Version required: %s"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
# , c-format
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, fuzzy, c-format
msgid "line %d: %s"
msgstr "Öffnen von %s fehlgeschlagen: %s"
# , c-format
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, fuzzy, c-format
msgid "Unable to open %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
#, fuzzy
msgid "No buildable architectures"
msgstr "Paket-Architektur nicht überprüfen"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
#, fuzzy
msgid "Package has no %%description: %s"
msgstr "Paket %s wird nicht in %s aufgeführt"
@@ -2824,40 +2824,40 @@ msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "umbennen von %s nach %s fehlgeschlagen: %s"
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
# FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/install.c:939
+#: lib/install.c:940
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -3186,83 +3186,83 @@ msgid "can't query %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "öffnen von %s fehlgeschlagen: %s\n"
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, 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:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr "Anfrage von %s fehlgeschlagen\n"
-#: lib/query.c:561
+#: lib/query.c:560
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "Anfrage von %s fehlgeschlagen\n"
-#: lib/query.c:584
+#: lib/query.c:583
#, fuzzy
msgid "no packages\n"
msgstr "Anfrage an alle Pakete"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr "kein Paket triggert %s\n"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr "kein Paket verlangt %s\n"
# oder besser: ... listet %s auf? -ke-
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr "kein Paket stellt %s bereit\n"
# , c-format
-#: lib/query.c:655
+#: lib/query.c:654
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/query.c:658
+#: lib/query.c:657
#, 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:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "ungültige Paket-Nummer: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "ungültige Paket-Nummer: %s\n"
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr "Eintrag %d konnte nicht gelesen werden\n"
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr "Paket %s ist nicht installiert\n"
@@ -3547,109 +3547,109 @@ 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:134
+#: lib/rpminstall.c:135
#, fuzzy
msgid "counting packages to install\n"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, fuzzy, c-format
msgid "found %d packages\n"
msgstr "Anfrage an alle Pakete"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
#, fuzzy
msgid "looking for packages to download\n"
msgstr "Fehler beim Suchen nach Paket %s\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
# , c-format
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, 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:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "Fehler: %s kann nicht installiert werden\n"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
#, fuzzy
msgid "installing binary packages\n"
msgstr "Paket installieren"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" bezeichnet mehrere Pakete\n"
# oder besser: "... verletzen" ?
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "Installiere %s\n"
@@ -4035,22 +4035,18 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "Warnung: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "Fehler: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "Fataler Fehler: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/es.po b/po/es.po
index d4b636fcb..f12668c63 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1034,39 +1034,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1416,11 +1416,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1789,7 +1789,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1822,17 +1822,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1842,11 +1842,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1911,7 +1911,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1941,22 +1941,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2016,7 +2016,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2041,65 +2041,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2554,39 +2554,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2877,80 +2877,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3686,22 +3686,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/fi.po b/po/fi.po
index d020ac93f..ca0452831 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -9,7 +9,7 @@ msgstr ""
"Xgettext-Options: --default-domain=rpm --add-comments --keyword=_ "
"--keyword=N_\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "virhe: en voi avata %s%s/packages.rpm\n"
@@ -1141,40 +1141,40 @@ msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
msgid "exec failed\n"
msgstr "%s: avaus ei onnistunut\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "--querytags: odottamattomia parametrejä"
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "allekirjoituksen tarkistukselle ei määritelty paketteja"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "allekirjoitukselle ei määritelty paketteja"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "poistolle ei määritelty paketteja"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "asennukselle ei määritelty paketteja"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "kyselylle ei annettu parametrejä"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "tarkistukselle ei annettu parametrejä"
@@ -1592,11 +1592,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr "uudelleenkäännolle ei määritelty paketteja"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "käännökselle ei annettu määrittelytiedostoja"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "käännökselle ei määritelty tar-tiedostoja"
@@ -1972,7 +1972,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -2005,17 +2005,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, fuzzy, c-format
msgid "line %d: Bad option %s: %s"
msgstr "en voinut avata %s: %s"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, fuzzy, c-format
msgid "line %d: Package does not exist: %s"
msgstr "paketti %s ei ole %s:ssä"
@@ -2025,11 +2025,11 @@ msgstr "paketti %s ei ole %s:ssä"
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -2094,7 +2094,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "en voinut avata %s: %s"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -2124,22 +2124,22 @@ msgstr "%s:n puuttuva arkkitehtuuri %s:%d"
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, fuzzy, c-format
msgid "Bad package specification: %s"
msgstr " Paketin määrittelyparametrit:"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2224,66 +2224,66 @@ msgstr "paketti %s ei ole %s:ssä"
msgid "line %d: Version required: %s"
msgstr "en voinut avata %s: %s"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, fuzzy, c-format
msgid "line %d: %s"
msgstr "en voinut avata %s: %s"
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, fuzzy, c-format
msgid "Unable to open %s: %s\n"
msgstr "%s:n avaus epäonnistui\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
#, fuzzy
msgid "No buildable architectures"
msgstr "älä tarkista paketin arkkitehtuuria"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
#, fuzzy
msgid "Package has no %%description: %s"
msgstr "paketti %s ei ole %s:ssä"
@@ -2746,39 +2746,39 @@ msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s"
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -3102,81 +3102,81 @@ msgid "can't query %s: %s\n"
msgstr "virhe: en voi avata %s\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s ei vaikuta RPM-paketilta\n"
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr "%s:n kysely ei onnistunut\n"
-#: lib/query.c:561
+#: lib/query.c:560
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "%s:n kysely ei onnistunut\n"
-#: lib/query.c:584
+#: lib/query.c:583
#, fuzzy
msgid "no packages\n"
msgstr "kysele kaikki paketit"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr "mikään paketti ei laukaise %s:a\n"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr "mikään pakettie ei tarvitse %s:a\n"
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr "mikään paketti ei tarjoa %s:a\n"
-#: lib/query.c:655
+#: lib/query.c:654
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "virheellinen paketin numero: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "virheellinen paketin numero: %s\n"
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr "tietuetta %d ei voitu lukea\n"
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
@@ -3455,107 +3455,107 @@ msgstr "virhe luotaessa hakemistoa %s: %s"
msgid "failed to remove directory %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
#, fuzzy
msgid "counting packages to install\n"
msgstr "asennukselle ei määritelty paketteja"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, fuzzy, c-format
msgid "found %d packages\n"
msgstr "kysele kaikki paketit"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
#, fuzzy
msgid "looking for packages to download\n"
msgstr "virhe etsittäessä pakettia %s\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr "Haen: %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "virhe: %s ei voida asentaa\n"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "puuttuvat riippuvuudet:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
#, fuzzy
msgid "installing binary packages\n"
msgstr "asenna paketti"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" määrittää useita paketteja\n"
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "Asennan: %s\n"
@@ -3939,22 +3939,18 @@ msgstr "en voinut avata %s: %s"
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "varoitus: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "virhe: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "vakava virhe: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/fr.po b/po/fr.po
index 8d3eb1f29..a0f9278a1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
msgid ""
-msgstr "POT-Creation-Date: 2000-08-29 15:35-0400\n"
+msgstr "POT-Creation-Date: 2000-08-30 22:29-0400\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1172,42 +1172,42 @@ msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
msgid "exec failed\n"
msgstr "La construction a échoué.\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "aucun package n'a été spécifié pour la vérification de signature"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
#, fuzzy
msgid "no packages given for signing"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
#, fuzzy
msgid "extra arguments given for query of all packages"
msgstr "aucun argument n'a été fourni pour la requęte"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "aucun argument n'a été fourni pour la requęte"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "aucun argument n'a été fourni pour la requęte"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "aucun argument n'a été fourni pour la vérification"
@@ -1607,11 +1607,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr "aucun package n'a été spécifié pour la reconstruction"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "aucun package n'a été spécifié pour la construction"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
#, fuzzy
msgid "no tar files given for build"
msgstr "aucun package n'a été spécifié pour la construction"
@@ -1983,7 +1983,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -2016,17 +2016,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, fuzzy, c-format
msgid "line %d: Bad option %s: %s"
msgstr "impossible d'ouvrir: %s\n"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -2036,11 +2036,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -2105,7 +2105,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "impossible d'ouvrir: %s\n"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -2135,22 +2135,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, fuzzy, c-format
msgid "Bad package specification: %s"
msgstr " Options de spécification de package:"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2210,7 +2210,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2235,66 +2235,66 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr "impossible d'ouvrir: %s\n"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, fuzzy, c-format
msgid "line %d: %s"
msgstr "impossible d'ouvrir: %s\n"
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, fuzzy, c-format
msgid "Unable to open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
#, fuzzy
msgid "No buildable architectures"
msgstr "%s ne peut ętre construit sur cette architecture\n"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
#, fuzzy
msgid "Package has no %%description: %s"
msgstr "aucun package n'a été spécifié pour la désinstallation"
@@ -2755,39 +2755,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -3111,81 +3111,81 @@ msgid "can't query %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "La construction a échoué.\n"
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
#, fuzzy
msgid "no packages\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, fuzzy, c-format
msgid "no package triggers %s\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "aucun package n'a été spécifié pour l'installation"
@@ -3463,105 +3463,105 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
#, fuzzy
msgid "counting packages to install\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3930,22 +3930,18 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/gl.po b/po/gl.po
index d4b636fcb..f12668c63 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1034,39 +1034,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1416,11 +1416,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1789,7 +1789,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1822,17 +1822,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1842,11 +1842,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1911,7 +1911,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1941,22 +1941,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2016,7 +2016,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2041,65 +2041,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2554,39 +2554,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2877,80 +2877,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3686,22 +3686,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/hu.po b/po/hu.po
index d4b636fcb..f12668c63 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1034,39 +1034,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1416,11 +1416,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1789,7 +1789,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1822,17 +1822,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1842,11 +1842,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1911,7 +1911,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1941,22 +1941,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2016,7 +2016,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2041,65 +2041,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2554,39 +2554,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2877,80 +2877,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3686,22 +3686,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/id.po b/po/id.po
index d4b636fcb..f12668c63 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1034,39 +1034,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1416,11 +1416,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1789,7 +1789,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1822,17 +1822,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1842,11 +1842,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1911,7 +1911,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1941,22 +1941,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2016,7 +2016,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2041,65 +2041,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2554,39 +2554,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2877,80 +2877,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3686,22 +3686,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/is.po b/po/is.po
index a2cfe53e4..f697c65e5 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 1.37\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "get ekki opnađ %s/packages.rpm\n"
@@ -1049,39 +1049,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1431,11 +1431,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1804,7 +1804,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1837,17 +1837,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1857,11 +1857,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1926,7 +1926,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1956,22 +1956,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2031,7 +2031,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2056,65 +2056,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2569,39 +2569,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2892,80 +2892,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3242,104 +3242,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "get ekki opnađ pakka gagnagrunn í\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3701,22 +3701,18 @@ msgstr "Skrá %s: %s"
msgid "File %s is smaller than %d bytes"
msgstr "Skráin %s er minni en %d bćti"
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "ađvörun: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "villa: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "banvćn villa: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr "innvćr villa (í rpm?): "
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3761,3 +3757,6 @@ msgstr "gat ekki opnađ %s: %s\n"
#, c-format
msgid "failed to create %s: %s\n"
msgstr "gat ekki búiđ til %s: %s\n"
+
+#~ msgid "internal error (rpm bug?): "
+#~ msgstr "innvćr villa (í rpm?): "
diff --git a/po/it.po b/po/it.po
index d4b636fcb..f12668c63 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1034,39 +1034,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1416,11 +1416,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1789,7 +1789,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1822,17 +1822,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1842,11 +1842,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1911,7 +1911,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1941,22 +1941,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2016,7 +2016,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2041,65 +2041,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2554,39 +2554,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2877,80 +2877,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3686,22 +3686,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/ja.po b/po/ja.po
index 15d407476..b2b8f4029 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: EUC-JP\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
@@ -83,7 +83,7 @@ msgstr "ĽżĄźĽ˛ĽĂĽČ %s ÍѤ˺îŔŽĂć\n"
# build root [BuildRoot]
# net share [ĽÍĽĂĽČśŚÍ­]
# reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë]
-# $Id: ja.po,v 1.111 2000/08/29 22:04:37 jbj Exp $
+# $Id: ja.po,v 1.112 2000/08/31 02:38:59 jbj Exp $
#: rpm.c:178 rpmqv.c:257
#, c-format
msgid "rpm: %s\n"
@@ -1125,40 +1125,40 @@ msgstr "--sign ¤ĎĽŃĽĂĽąĄźĽ¸şîŔŽťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
msgid "exec failed\n"
msgstr "źÂšÔźşÇÔ\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¤Î°úżô¤Ź´Ö°ă¤Ă¤Ć¤¤¤Ţ¤š"
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "˝đĚž¸Ąşş¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "˝đĚž¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "Á´ĽŃĽĂĽąĄźĽ¸¤ÎĚ䤤šç¤ď¤ť¤Î¤ż¤á¤Ë͞ʏ¤Ę°úżô¤Ź¤˘¤ę¤Ţ¤š"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "Á´ĽŃĽĂĽąĄźĽ¸¤Î¸ĄžÚ¤Î¤ż¤á¤Ë͞ʏ¤Ę°úżô¤Ź¤˘¤ę¤Ţ¤š"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "¸ĄžÚ¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
@@ -1544,11 +1544,11 @@ msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
msgid "no packages files given for rebuild"
msgstr "şĆşîŔŽ¤š¤ë¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "şîŔŽ¤Î¤ż¤á¤Î spec ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "şîŔŽ(build)¤Î¤ż¤á¤Î tar ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
@@ -1923,7 +1923,7 @@ msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Î ˝ĐÎĎĽŐĽĄĽ¤ĽëĚž¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s\n"
msgid "cannot create %s: %s\n"
msgstr "%s ¤ňşîŔŽ¤Ç¤­¤Ţ¤ť¤ó: %s\n"
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr "%d šÔĚÜ: 2ČÖĚܤΠ%s"
@@ -1956,17 +1956,17 @@ msgstr "%%changelog Ăć¤ËŔâĚŔ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
msgid "line %d: Error parsing %%description: %s"
msgstr "%d šÔĚÜ: %%description ¤Î˛ňŔĎĽ¨ĽéĄź: %s"
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr "%d šÔĚÜ: ÉÔŔľ¤ĘĽŞĽ×ĽˇĽçĽó %s:%s"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr "%d šÔĚÜ: ĚžÁ°¤ŹÂż¤š¤Ž¤Ţ¤š: %s"
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr "%d šÔĚÜ: ĽŃĽĂĽąĄźĽ¸¤ŹÂ¸şß¤ˇ¤Ţ¤ť¤ó: %s"
@@ -1976,11 +1976,11 @@ msgstr "%d šÔĚÜ: ĽŃĽĂĽąĄźĽ¸¤ŹÂ¸şß¤ˇ¤Ţ¤ť¤ó: %s"
msgid "line %d: Second description"
msgstr "%d šÔĚÜ: 2ČÖĚܤÎŔâĚŔ"
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr "%d šÔĚÜ: %%files ¤Î˛ňŔĎĽ¨ĽéĄź: %s"
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr "%d šÔĚÜ: 2ČÖĚܤΠ%%files ĽęĽšĽČ"
@@ -2045,7 +2045,7 @@ msgstr "%d šÔĚÜ: śő¤ÎĽżĽ°: %s"
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "%d šÔĚÜ: %s Ăć¤ËÉÔŔľ¤Ęʸťú '-' : %s"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, fuzzy, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr "%d šÔĚÜ: BuildRoot ¤Ď \"/\" ¤Ë¤š¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó: %s"
@@ -2075,22 +2075,22 @@ msgstr "%d šÔĚÜ: ÉÔŔľ¤Ę BuildArchitecture ĽŐĽŠĄźĽŢĽĂĽČ: %s"
msgid "Internal error: Bogus tag %d"
msgstr "ĆâÉôĽ¨ĽéĄź: ¤Ë¤ť¤ÎĽżĽ° %d"
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr "ÉÔŔľ¤ĘĽŃĽĂĽąĄźĽ¸¤ÎťŘÄę: %s"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr "ĽŃĽĂĽąĄźĽ¸¤Ď¤š¤Ç¤Ë¸şß¤ˇ¤Ć¤¤¤Ţ¤š: %s"
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr "%d šÔĚÜ: ÉÔĚŔ¤ĘĽżĽ°: %s"
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr "ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë¤Ď BuildRoot ¤ňťČÍѤǤ­¤Ţ¤ť¤ó"
@@ -2150,7 +2150,7 @@ msgstr "ĽŃĽĂĽÁ¤ŹÂż¤š¤Ž¤Ţ¤š"
msgid "line %d: Bad arg to %%patch: %s"
msgstr "%d šÔĚÜ: %%patch ¤Ř¤ÎÉÔŔľ¤Ę°úżô: %s"
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr "%d šÔĚÜ: 2ČÖĚܤΠ%%prep"
@@ -2176,67 +2176,67 @@ msgstr "%d šÔĚÜ: ĽĐĄźĽ¸ĽçĽóÉŐ¤ą¤ľ¤ě¤żĽŐĽĄĽ¤ĽëĚž¤Ďľö˛Ä¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s"
msgid "line %d: Version required: %s"
msgstr "%d šÔĚÜ: ĽĐĄźĽ¸ĽçĽó¤ŹÉŹÍפǤš: %s"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr "%d šÔĚÜ: ĽČĽęĽŹĄź¤Ď -- ¤Ź¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó: %s"
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr "%d šÔĚÜ: %s ¤Îš˝Ę¸˛ňŔĎĽ¨ĽéĄź: %s"
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr "%d šÔĚÜ: ĽšĽŻĽęĽ×ĽČĽ×ĽíĽ°ĽéĽŕ¤Ď '/' ¤ÇťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó: %s"
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr "%d šÔĚÜ: 2ČÖĚܤΠ%s"
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr "%d šÔĚÜ: %s"
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, fuzzy, c-format
msgid "Unable to open %s: %s\n"
msgstr "ĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr "%%if ¤ŹĘĤ¸¤Ć¤¤¤Ţ¤ť¤ó"
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr "%s%d: parseExpressionBoolean ¤Ź %d ¤ňĘÖ¤ˇ¤Ţ¤ˇ¤ż"
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
#, fuzzy
msgid "%s:%d: Got a %%else with no if"
msgstr "%s:%d: if ¤Ź¤Ę¤¤¤Î¤Ë %%else ¤Ź¤˘¤ę¤Ţ¤š"
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
#, fuzzy
msgid "%s:%d: Got a %%endif with no if"
msgstr "%s:%d: if ¤Ź¤Ę¤¤¤Î¤Ë %%endif ¤Ź¤˘¤ę¤Ţ¤š"
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr "¤Ş¤Ť¤ˇ¤Ę %%include ĽšĽĆĄźĽČĽáĽóĽČ¤Ç¤š"
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr "şîŔŽ(build)˛ÄÇ˝¤ĘĽ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Ď¤˘¤ę¤Ţ¤ť¤ó"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë¤Ď %%description ¤Ź¤˘¤ę¤Ţ¤ť¤ó: %s"
@@ -2705,39 +2705,39 @@ msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ď .spec ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó"
msgid "renaming %s to %s\n"
msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "%s ¤ň %s ¤Ë¤š¤ëĚžÁ°¤ÎĘŃšš¤ËźşÇÔ: %s"
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ź´üÂÔ¤ľ¤ě¤Ţ¤šĄ˘ĽĐĽ¤ĽĘĽę¤Ď¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż"
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "ĽŃĽĂĽąĄźĽ¸: %s-%s-%s ĽŐĽĄĽ¤ĽëĽĆĽšĽČ = %d\n"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr "--test ¤ňźÂšÔ¤š¤ë¤č¤Ś¤ËĽ¤ĽóĽšĽČĄźĽë¤ňĂćťß¤ˇ¤Ć¤¤¤Ţ¤š\n"
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr "Ľ×ĽęĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆşîŔŽ¤ľ¤ě¤Ţ¤š"
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆĘݸ¤ľ¤ě¤Ţ¤š"
-#: lib/install.c:1154
+#: lib/install.c:1155
#, fuzzy
msgid "running postinstall scripts (if any)\n"
msgstr "ĽÝĽšĽČĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
@@ -3068,81 +3068,81 @@ msgid "can't query %s: %s\n"
msgstr "%s ¤ňşď˝ü(unlink)¤Ç¤­¤Ţ¤ť¤ó: %s\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n"
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr "ľěˇÁź°¤ÎĽ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s ¤Ď RPM ĽŃĽĂĽąĄźĽ¸¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr "%s ¤Ř¤ÎĚ䤤šç¤ď¤ť¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: lib/query.c:561
+#: lib/query.c:560
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë %s ¤Ř¤ÎĚ䤤šç¤ď¤ť¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤żĄ˘ĽŃĄźĽš¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/query.c:584
+#: lib/query.c:583
#, fuzzy
msgid "no packages\n"
msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "Ľ°ĽëĄźĽ× %s ¤Ë°¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr "%s ¤ňĽČĽęĽŹĄź¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr "%s ¤ňÉŹÍפȤš¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr "%s ¤ňÄ󜥤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s: %s\n"
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ď¤É¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤â°¤ˇ¤Ć¤¤¤Ţ¤ť¤ó\n"
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "Ěľ¸ú¤ĘĽŃĽĂĽąĄźĽ¸ČÖšć: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ĽěĽłĄźĽÉČÖšć %d\n"
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n"
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
@@ -3423,104 +3423,104 @@ msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤Îşď˝üźşÇÔ: %s\n"
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëĽŃĽĂĽąĄźĽ¸¤ňżô¤¨¤Ć¤¤¤Ţ¤š\n"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr "ĽŔĽŚĽóĽíĄźĽÉ¤š¤ëĽŃĽĂĽąĄźĽ¸¤ňĂľ¤ˇ¤Ć¤¤¤Ţ¤š\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n"
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr "%s ¤ňźčĆŔ¤ˇ¤Ć¤¤¤Ţ¤š\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr "%s ¤Č¤ˇ¤Ć...\n"
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n"
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ňźčĆŔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s"
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ť¤é¤ÎĆɤߚţ¤ßĽ¨ĽéĄź "
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ë¤Ď¤č¤ężˇ¤ˇ¤¤ RPM ¤ÎĽĐĄźĽ¸ĽçĽó¤ŹÉŹÍפǤš\n"
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n"
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "°Í¸Ŕ­¤ÎˇçÇĄ:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr "ĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¤ĎĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤡ¤Ć¤¤¤Ţ¤š\n"
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "¤ł¤ě¤é¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤š¤ë¤Č°Í¸Ŕ­¤ňÇ˲ő¤ˇ¤Ţ¤š:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n"
@@ -3909,22 +3909,18 @@ msgstr "ĽŐĽĄĽ¤Ľë %s: %s"
msgid "File %s is smaller than %d bytes"
msgstr "ĽŐĽĄĽ¤Ľë %s: ¤Ď %d ĽĐĽ¤ĽČ¤č¤ęžŽ¤ľ¤¤¤Ç¤š"
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "ˇŮšđ: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "Ľ¨ĽéĄź: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "Ă×̿Ū¤ĘĽ¨ĽéĄź: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr "ĆâÉôĹŞ¤ĘĽ¨ĽéĄź (rpm ¤ÎĽĐĽ°?)"
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3971,6 +3967,9 @@ msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s"
msgid "failed to create %s: %s\n"
msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
+#~ msgid "internal error (rpm bug?): "
+#~ msgstr "ĆâÉôĹŞ¤ĘĽ¨ĽéĄź (rpm ¤ÎĽĐĽ°?)"
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "2ČÖĚܤΠ':' ¤Ź¤˘¤ę¤Ţ¤ť¤ó(%s:%d ¤Ç)"
diff --git a/po/ko.po b/po/ko.po
index d4b636fcb..f12668c63 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1034,39 +1034,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1416,11 +1416,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1789,7 +1789,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1822,17 +1822,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1842,11 +1842,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1911,7 +1911,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1941,22 +1941,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2016,7 +2016,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2041,65 +2041,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2554,39 +2554,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2877,80 +2877,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3686,22 +3686,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/no.po b/po/no.po
index afcc83a70..c817bd40d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-0400\n"
"PO-Revision-Date: 2000-08-04 02:59+02:00\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "kan ikke ĺpne %s/packages.rpm\n"
@@ -1051,39 +1051,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1433,11 +1433,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1806,7 +1806,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1839,17 +1839,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1859,11 +1859,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1928,7 +1928,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1958,22 +1958,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2033,7 +2033,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2058,65 +2058,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2571,39 +2571,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2894,80 +2894,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3244,104 +3244,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kan ikke ĺpne pakkedatabase i %s\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, 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:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fant %d kilde- og %d binćrpakker\n"
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "feilede avhengigheter:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr "installerer binćrpakker\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" spesifiserer flere pakker\n"
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "fjerning av disse pakkene vil řdelegge avhengigheter:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke ĺpne %s: %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
@@ -3703,22 +3703,18 @@ msgstr "Fil %s: %s"
msgid "File %s is smaller than %d bytes"
msgstr "Fil %s er mindre enn %d bytes"
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "advarsel: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "feil: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "fatal feil: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr "intern feil (rpm feil?): "
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3764,6 +3760,9 @@ msgstr "klarte ikke ĺ ĺpne %s: %s\n"
msgid "failed to create %s: %s\n"
msgstr "kunne ikke opprette %s: %s\n"
+#~ msgid "internal error (rpm bug?): "
+#~ msgstr "intern feil (rpm feil?): "
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "mangler andre ':' ved %s:%d"
diff --git a/po/pl.po b/po/pl.po
index bea431132..7e0dcbaa8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "nie można otworzyć %s/packages.rpm\n"
@@ -1108,39 +1108,39 @@ msgstr "--sign można użyć tylko w trakcie budowania pakietu"
msgid "exec failed\n"
msgstr "wykonanie nie powiodło się\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "nieoczekiwane argumenty dla --querytags "
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "nie podano nazwy pakietu do sprawdzenia sygnatury"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "nie podano nazwy pakietu do podpisania"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "nie podano nazw plików do usunięcia"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "nie podano nazw plików do zainstalowania"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "zbyt wiele argumentów dla odpytywania wszystkich pakietów"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "nie podano argumentów dla trybu zapytań"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr "zbyt wiele argumentów dla weryfikacji wszystkich pakietów"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "nie podano argumentów dla sprawdzania"
@@ -1555,11 +1555,11 @@ msgstr "--justdb można użyć tylko w trakcie instalacji lub usuwania pakietów"
msgid "no packages files given for rebuild"
msgstr "nie podano nazw pakietów do przebudowania"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "nie podano nazw plików spec do budowania"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "nie podano nazw plików tar do budowania"
@@ -1933,7 +1933,7 @@ msgstr "Nie można wygenerować wyjściowej nazwy dla pakietu %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "nie można utworzyć %s"
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr "linia %d: druga %s"
@@ -1966,17 +1966,17 @@ msgstr "brak opisu w %%changelog"
msgid "line %d: Error parsing %%description: %s"
msgstr "linia %d: błąd w interpretacji wpisu %%description: %s"
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr "linia %d: Błedna opcja %s: %s"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr "linia %d: Zbyt dużo nazw: %s"
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr "linia %d: Pakiet nie istnieje: %s"
@@ -1986,11 +1986,11 @@ msgstr "linia %d: Pakiet nie istnieje: %s"
msgid "line %d: Second description"
msgstr "linia %d: Drugi opis"
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr "linia %d: Błąd w interpretacji wpisu %%files: %s"
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr "linia %d: Druga lista %%files"
@@ -2055,7 +2055,7 @@ msgstr "linia %d: Pusta etykieta: %s"
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "linia %d: Nielegalny znak '-' w %s: %s"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, fuzzy, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr "linia %d: wpis BuildRoot nie może być \"/\": %s"
@@ -2085,22 +2085,22 @@ msgstr "linia %d: Błędny format wpisu BuildArchitecture: %s"
msgid "Internal error: Bogus tag %d"
msgstr "Błąd wewnętrzny: Fałszywa etykieta %d"
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr "Błędna specyfikacja pakietu: $s"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr "Pakiet już istnieje: %s"
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr "linia %d: Nieznana etykieta: %s"
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr "W pliku spec nie można używać wpisów BuildRoot"
@@ -2160,7 +2160,7 @@ msgstr "Zbyt wiele łat!"
msgid "line %d: Bad arg to %%patch: %s"
msgstr "linia %d: Błędny argument dla %%patch: %s"
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr "linia %d: druga sekcja %%prep"
@@ -2186,65 +2186,65 @@ msgstr "linia %d: Wersja w nazwach plików niedozwolona: %s"
msgid "line %d: Version required: %s"
msgstr "linia %d: Wymagana wersja: %s"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr "linia %d: triggery muszą mieć --: %s"
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr "linia %d: Błąd przetwarzania %s: %s"
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr "linia %d: skrypt (tu jako program) musi się zaczynać od '/': %s"
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr "linia %d: Drugi %s"
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr "linia %d: %s"
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, fuzzy, c-format
msgid "Unable to open %s: %s\n"
msgstr "Nie można otworzyć: %s\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr "Niedomknięte %%if"
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr "%s:%d: Napotkano %%else bez if"
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr "%s:%d: Napotkano %%endif bez if"
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr "błednie sformatowany wpis %%include"
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr "Nie można budować na takie architektury"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr "Pakiet nie ma %%description: %s"
@@ -2699,39 +2699,39 @@ msgstr "pakiet źródłowy nie zawiera pliku .spec"
msgid "renaming %s to %s\n"
msgstr "zmiana nazwy %s na %s\n"
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "zmiana nazwy z %s na %s nie powiodła sie: %s"
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr "spodziewany pakiet źródłowy a nie binarny"
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "pakiet: %s-%s-%s test plików = %d\n"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr "przebieg testowy - instalacja zatrzymana\n"
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr "uruchamianie skryptu preinstall (jeśli istnieje)\n"
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr "ostrzeżenie: %s utworzony jako %s"
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr "ostrzeżenie: %s zapisany jako %s"
-#: lib/install.c:1154
+#: lib/install.c:1155
#, fuzzy
msgid "running postinstall scripts (if any)\n"
msgstr "uruchamianie skryptu postinstall (jeśli istnieje)\n"
@@ -3043,81 +3043,81 @@ msgid "can't query %s: %s\n"
msgstr "nie można odwiązać %s: %s\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otwarcie %s nie powiodło się\n"
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr "pakiety w starym formacie nie mogą być odpytywane\n"
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, 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:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr "odpytywanie %s nie powiodło się\n"
-#: lib/query.c:561
+#: lib/query.c:560
#, 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:584
+#: lib/query.c:583
#, fuzzy
msgid "no packages\n"
msgstr "znaleziono %d pakietów\n"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupa %s nie zawiera żadnych pakietów\n"
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr "żaden pakiet nie zahacza %s\n"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr "żaden pakiet nie wymaga %s\n"
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr "żaden pakiet nie udostępnia %s\n"
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr "plik %s: %s\n"
-#: lib/query.c:658
+#: lib/query.c:657
#, 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:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "błędny numer pakietu: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "numer rekordu pakietu: %d\n"
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr "nie można odczytać rekordu %d\n"
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
@@ -3398,104 +3398,104 @@ 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:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr "zliczanie pakietów do zainstalowania\n"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr "znaleziono %d pakietów\n"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr "szukanie pakietów do ściągnięcia\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "%s pomijany - transmisja %s nie powiodła się\n"
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, 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:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr "... jako %s\n"
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s pomijany - transmisja %s nie powiodła się\n"
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr "ściągnięto %d pakietów\n"
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie można otworzyć pliku %s: %s"
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie może być zainstalowany\n"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nie można otworzyć %s/packages.rpm\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr "błąd czytania z pliku %s\n"
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "plik %s wymaga nowszej wersji RPM\n"
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, 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:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "niespełnione zależności:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr "instalacja pakietów binarnych\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" określa wiele pakietów\n"
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "usunięcie tych pakietów zerwie zależności:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie można otworzyć %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "Instalacja %s\n"
@@ -3863,22 +3863,18 @@ msgstr "Plik %s: %s"
msgid "File %s is smaller than %d bytes"
msgstr "Plik %s jest mniejszy niż %d bajtów"
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "ostrzeżenie: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "błąd: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "fatalny błąd: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr "błąd wewnętrzny (błąd w rpm'ie?): "
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3924,6 +3920,9 @@ msgstr "nie można otworzyć %s: %s"
msgid "failed to create %s: %s\n"
msgstr "utworzenie %s nie powiodło się\n"
+#~ msgid "internal error (rpm bug?): "
+#~ msgstr "błąd wewnętrzny (błąd w rpm'ie?): "
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "brak drugiego ':' przy %s:%d"
diff --git a/po/pt.po b/po/pt.po
index 6044985a1..9c47c3f0d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-latin1\n"
"Content-Transfer-Encoding: none\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1031,39 +1031,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1413,11 +1413,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1786,7 +1786,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1819,17 +1819,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1839,11 +1839,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1908,7 +1908,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1938,22 +1938,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2013,7 +2013,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2038,65 +2038,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2551,39 +2551,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2874,80 +2874,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3226,104 +3226,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3685,22 +3685,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index dd382242c..6177363ac 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,9 +2,9 @@
# Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
#
msgid ""
-msgstr "POT-Creation-Date: 2000-08-29 15:35-0400\n"
+msgstr "POT-Creation-Date: 2000-08-30 22:29-0400\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1180,40 +1180,40 @@ msgstr "--sign somente pode ser usado durante a construçăo de pacotes"
msgid "exec failed\n"
msgstr "Construçăo falhou.\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "argumentos năo esperados em --querytags"
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "nenhum pacote informado para checagem de assinatura"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "năo foram passados pacotes para assinatura"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "năo foi passado pacote para desinstalaçăo"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "năo foi passado pacote para instalaçăo"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "năo foi passado argumento para pesquisa"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "năo foi passado argumento para verificaçăo"
@@ -1631,11 +1631,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr "năo foram passados pacotes para reconstruçăo"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "năo foi passado arquivo spec para construçăo"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "năo foram passados arquivos tar para construçăo"
@@ -2035,7 +2035,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -2069,17 +2069,17 @@ msgid "line %d: Error parsing %%description: %s"
msgstr ""
# , c-format
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, fuzzy, c-format
msgid "line %d: Bad option %s: %s"
msgstr "Năo consegui abrir: %s\n"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -2089,11 +2089,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -2161,7 +2161,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "Năo consegui abrir: %s\n"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -2191,22 +2191,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, fuzzy, c-format
msgid "Bad package specification: %s"
msgstr " Opcőes para especificaçăo de pacotes:"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2268,7 +2268,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2294,69 +2294,69 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr "Năo consegui abrir: %s\n"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
# , c-format
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, fuzzy, c-format
msgid "line %d: %s"
msgstr "Năo consegui ler o arquivo spec de %s\n"
# , c-format
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, fuzzy, c-format
msgid "Unable to open %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
# , c-format
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
#, fuzzy
msgid "No buildable architectures"
msgstr "%s năo pode ser construido nesta arquitetura\n"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
#, fuzzy
msgid "Package has no %%description: %s"
msgstr "năo foi passado pacote para desinstalaçăo"
@@ -2824,39 +2824,39 @@ msgstr "pesquise o pacote ao qual <arquivo> pertence"
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -3175,81 +3175,81 @@ msgid "can't query %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "Construçăo falhou.\n"
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
#, fuzzy
msgid "no packages\n"
msgstr "pesquise todos os pacotes"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, fuzzy, c-format
msgid "no package triggers %s\n"
msgstr "năo foram passados pacotes para assinatura"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "năo foi passado pacote para instalaçăo"
@@ -3548,21 +3548,21 @@ msgstr "RPM versăo %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
#, fuzzy
msgid "counting packages to install\n"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, fuzzy, c-format
msgid "found %d packages\n"
msgstr "pesquise todos os pacotes"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
@@ -3575,92 +3575,92 @@ msgstr ""
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, 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:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
# , c-format
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "năo foi passado pacote para instalaçăo"
# , c-format
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
#, fuzzy
msgid "failed dependencies:\n"
msgstr "lista dependęncias do pacote"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
#, fuzzy
msgid "installing binary packages\n"
msgstr "instale pacote"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
#, fuzzy
msgid "removing these packages would break dependencies:\n"
msgstr "lista dependęncias do pacote"
# , c-format
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -4049,22 +4049,18 @@ msgstr "Năo consegui ler o arquivo spec de %s\n"
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/ro.po b/po/ro.po
index d2d9d9621..bebc753ab 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1029,39 +1029,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1411,11 +1411,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1784,7 +1784,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1817,17 +1817,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1837,11 +1837,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1906,7 +1906,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1936,22 +1936,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2011,7 +2011,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2036,65 +2036,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2549,39 +2549,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2872,80 +2872,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3222,104 +3222,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3681,22 +3681,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index c7f220c7f..7f0cc654f 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-30 13:29-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -1034,39 +1034,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1416,11 +1416,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -3686,22 +3686,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/ru.po b/po/ru.po
index add939365..8df19f783 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1.1\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-0400\n"
"PO-Revision-Date: 2000-08-08 01:20+0300\n"
"Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -10,7 +10,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Date: 1999-04-03 12:20+0200\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "ĎŰÉÂËÁ ĎÔËŇŮÔÉŃ %s/packages.rpm\n"
@@ -1087,39 +1087,39 @@ msgstr "ĎĐĂÉŃ --sign ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ ĐÁËĹÔĎ×"
msgid "exec failed\n"
msgstr "ÚÁĐŐÓË ÎĹ ŐÄÁĚÓŃ\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "ÎĹĎÖÉÄÁÎÎŮĹ ÁŇÇŐÍĹÎÔŮ ÄĚŃ --querytags "
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐŇĎ×ĹŇËÉ ĐĎÄĐÉÓÉ"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐĎÄĐÉÓÉ"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÄÁĚĹÎÉŃ"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "× ÚÁĐŇĎÓĹ ËĎ ×ÓĹÍ ĐÁËĹÔÁÍ ÚÁÄÁÎŮ ĚÉŰÎÉĹ ÁŇÇŐÍĹÎÔŮ"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÚÁĐŇĎÓÁ"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr "× ÚÁĐŇĎÓĹ ×ĹŇÉĆÉËÁĂÉÉ ×ÓĹČ ĐÁËĹÔĎ× ÚÁÄÁÎŮ ĚÉŰÎÉĹ ÁŇÇŐÍĹÎÔŮ"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÄĚŃ ×ĹŇÉĆÉËÁĂÉÉ"
@@ -1482,11 +1482,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐĹŇĹÓÂĎŇËÉ"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "ÎĹ ÚÁÄÁÎ spec-ĆÁĘĚ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "ÎĹ ÚÁÄÁÎŮ tar-ĆÁĘĚŮ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
@@ -1855,7 +1855,7 @@ msgstr "îĹ×ĎÚÍĎÖÎĎ ÓÇĹÎĹŇÉŇĎ×ÁÔŘ ÉÍŃ ĆÁĘĚÁ ÄĚŃ ĐÁËĹÔÁ %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr "ÓÔŇĎËÁ %d: ×ÔĎŇĎĹ %s"
@@ -1888,17 +1888,17 @@ msgstr "ÎĹÔ ĎĐÉÓÁÎÉŃ × %%changelog"
msgid "line %d: Error parsing %%description: %s"
msgstr "ÓÔŇĎËÁ %d: ďŰÉÂËÁ ÁÎÁĚÉÚÁ %%description: %s"
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎÁŃ ĎĐĂÉŃ %s: %s"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr "ÓÔŇĎËÁ %d: óĚÉŰËĎÍ ÍÎĎÇĎ ÉÍĹÎ: %s"
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr "ÓÔŇĎËÁ %d: đÁËĹÔ ÎĹ ÓŐÝĹÓÔ×ŐĹÔ: %s"
@@ -1908,11 +1908,11 @@ msgstr "ÓÔŇĎËÁ %d: đÁËĹÔ ÎĹ ÓŐÝĹÓÔ×ŐĹÔ: %s"
msgid "line %d: Second description"
msgstr "ÓÔŇĎËÁ %d: ÷ÔĎŇĎĹ ĎĐÉÓÁÎÉĹ"
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr "ÓÔŇĎËÁ %d: ďŰÉÂËÁ ŇÁÚÂĎŇÁ %%files: %s"
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr "ÓÔŇĎËÁ %d: ÷ÔĎŇĎĘ ÓĐÉÓĎË %%files"
@@ -1977,7 +1977,7 @@ msgstr "ÓÔŇĎËÁ %d: đŐÓÔĎĘ ŃŇĚŮË: %s"
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "ÓÔŇĎËÁ %d: îĹÄĎĐŐÓÔÉÍŮĘ ÓÉÍ×ĎĚ '-' × %s: %s"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr "BuildRoot ÎĹ ÍĎÖĹÔ ÂŮÔŘ \"/\": %s"
@@ -2007,22 +2007,22 @@ msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎŮĘ ĆĎŇÍÁÔ BuildArchitecture: %s"
msgid "Internal error: Bogus tag %d"
msgstr "÷ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ: îĹÉÚ×ĹÓÔÎŮĘ ŃŇĚŮË %d"
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr "îĹ×ĹŇÎÁŃ ÓĐĹĂÉĆÉËÁĂÉŃ ĐÁËĹÔÁ: %s"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr "đÁËĹÔ ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ: %s"
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr "ÓÔŇĎËÁ %d: îĹÉÚ×ĹÓÔÎŮĘ ŃŇĚŮË: %s"
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr "ćÁĘĚ spec ÎĹ ÍĎÖĹÔ ÉÓĐĎĚŘÚĎ×ÁÔŘ BuildRoot"
@@ -2082,7 +2082,7 @@ msgstr "óĚÉŰËĎÍ ÍÎĎÇĎ ÚÁĐĚÁÔ!"
msgid "line %d: Bad arg to %%patch: %s"
msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎŮĘ ÁŇÇŐÍĹÎÔ ÄĚŃ %%patch: %s"
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr "ÓÔŇĎËÁ %d: ×ÔĎŇĎĘ %%prep"
@@ -2109,65 +2109,65 @@ msgstr "ÓÔŇĎËÁ %d: ÷ĹŇÓÉÉ × ÉÍĹÎÁČ ĆÁĘĚĎ× ÎĹÄĎĐŐÓÔÉÍŮ: %s"
msgid "line %d: Version required: %s"
msgstr "ÓÔŇĎËÁ %d: ôŇĹÂŐĹÔÓŃ ×ĹŇÓÉŃ: %s"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr "ÓÔŇĎËÁ %d: ÔŇÉÇÇĹŇŮ ÄĎĚÖÎŮ ÓĎÄĹŇÖÁÔŘ --: %s"
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr "ÓÔŇĎËÁ %d: ďŰÉÂËÁ ÁÎÁĚÉÚÁ %s: %s"
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr "ÓÔŇĎËÁ %d: đŇĎÇŇÁÍÍŮ × ÓËŇÉĐÔÁČ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó '/': %s"
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr "ÓÔŇĎËÁ %d: ÷ÔĎŇĎĹ %s"
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr "ÓÔŇĎËÁ %d: %s"
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr "îĹÚÁËŇŮÔŮĘ %%if"
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr "%s:%d: parseExpressionBoolean ËĎÄ ×ĎÚ×ŇÁÔÁ: %d"
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr "%s:%d: îÁĘÄĹÎ %%else ÂĹÚ %%if"
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr "%s:%d: îÁĘÄĹÎ %%endif ÂĹÚ %%if"
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr "ÎĹ×ĹŇÎĎĹ ĎÂßŃ×ĚĹÎÉĹ %%include"
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr "îĹÔ ÁŇČÉÔĹËÔŐŇ, ËĎÔĎŇŮĹ ÍĎÖÎĎ ĐĎÓÔŇĎÉÔŘ"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr "đÁËĹÔ ÎĹ ÉÍĹĹÔ %%description: %s"
@@ -2622,39 +2622,39 @@ msgstr "ÉÓČĎÄÎŮĘ ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ĆÁĘĚÁ .spec"
msgid "renaming %s to %s\n"
msgstr "ĐĹŇĹÉÍĹÎĎ×Ů×ÁŔ %s × %s\n"
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "ĎŰÉÂËÁ ĐĹŇĹÉÍĹÎĎ×ÁÎÉŃ %s × %s: %s"
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr "ĎÖÉÄÁĚÓŃ ÉÓČĎÄÎŮĘ ĐÁËĹÔ, ÎÁĘÄĹÎ ÂÉÎÁŇÎŮĘ"
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "ĐÁËĹÔ: %s-%s-%s ĆÁĘĚĎ×; test = %d\n"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr "ĎÓÔÁÎÁ×ĚÉ×ÁŔ ŐÓÔÁÎĎ×ËŐ, Ô.Ë. ÍŮ ÉÓĐĎĚÎŃĹÍ --test\n"
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr "ÉÓĐĎĚÎŃŔ ÓËŇÉĐÔ preinstall (ĹÓĚÉ ĹÓÔŘ)\n"
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr "ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: %s ÓĎÚÄÁÎ ËÁË %s"
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr "ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: %s ÓĎČŇÁÎĹÎ ËÁË %s"
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr "ÉÓĐĎĚÎŃŔ ÓËŇÉĐÔ postinstall (ĹÓĚÉ ĹÓÔŘ)\n"
@@ -2945,80 +2945,80 @@ msgid "can't query %s: %s\n"
msgstr "ÎĹ ÍĎÇŐ ŐÄÁĚÉÔŘ %s: %s\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr "ĎÔËŇŮÔÉĹ %s ÎĹ ŐÄÁĚĎÓŘ\n"
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr "ÚÁĐŇĎÓŮ Ë SRPM × ÓÔÁŇĎÍ ĆĎŇÍÁÔĹ ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ\n"
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s ÎĹ ĐĎČĎÖ ÎÁ ĐÁËĹÔ RPM...\n"
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr "ĎŰÉÂËÁ ÚÁĐŇĎÓÁ %s\n"
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "ÚÁĐŇĎÓ spec-ĆÁĘĚÁ %s ÎĹ ŐÄÁĚÓŃ, ÎĹ ÍĎÇŐ ŇÁÚĎÂŇÁÔŘ ĆÁĘĚ\n"
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr "ÎÁĘÄĹÎĎ %d ĐÁËĹÔĎ×\n"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "ÇŇŐĐĐÁ %s ÎĹ ÓĎÄĹŇÖÉÔ ÎÉËÁËÉČ ĐÁËĹÔĎ×\n"
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ×Ú×ĎÄÉÔ ÔŇÉÇÇĹŇ %s\n"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ÔŇĹÂŐĹÔ %s\n"
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ĐŇĹÄĎÓÔÁ×ĚŃĹÔ %s\n"
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr "ĆÁĘĚ %s: %s\n"
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "ĆÁĘĚ %s ÎĹ ĐŇÉÎÁÄĚĹÖÉÔ ÎÉ ĎÄÎĎÍŐ ÉÚ ĐÁËĹÔĎ×\n"
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "ÎĹ×ĹŇÎŮĘ ÎĎÍĹŇ ĐÁËĹÔÁ: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr "ÚÁĐÉÓŘ ĐÁËĹÔÁ ÎĎÍĹŇ %d\n"
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr "ÚÁĐÉÓŘ %d ÎĹ ŢÉÔÁĹÔÓŃ\n"
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n"
@@ -3297,104 +3297,104 @@ msgstr "ÓĎÚÄÁŔ ËÁÔÁĚĎÇ: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "ŐÄÁĚĹÎÉĹ ËÁÔÁĚĎÇÁ %s ÎĹ ŐÄÁĚĎÓŘ: %s\n"
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr "ÓŢÉÔÁŔ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ\n"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr "ÎÁĘÄĹÎĎ %d ĐÁËĹÔĎ×\n"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr "ÉÝŐ ĐÁËĹÔŮ ÄĚŃ ĐĎĚŐŢĹÎÉŃ Ó ftp/http\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "ĐŇĎĐŐÓËÁŔ %s - ĎŰÉÂËÁ ĐĹŇĹÄÁŢÉ - %s\n"
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr "đĎĚŐŢÁŔ %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr " ... ËÁË %s\n"
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "ĐŇĎĐŐÓËÁŔ %s - ĎŰÉÂËÁ ĐĹŇĹÄÁŢÉ - %s\n"
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr "ĐĎĚŐŢĹÎĎ %d ĐÁËĹÔĎ×\n"
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ÎĹ ÍĎÖĹÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎ\n"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s/packages.rpm\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr "ĐÁËĹÔ %s - ÎĹ ĐĹŇĹÍĹÝÁĹÍŮĘ\n"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÉÚ ĆÁĘĚÁ %s\n"
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ĆÁĘĚ %s ÔŇĹÂŐĹÔ ÂĎĚĹĹ ÎĎ×ĎĘ ×ĹŇÓÉÉ RPM\n"
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ÎÁĘÄĹÎĎ %d ÉÓČĎÄÎŮČ É %d ÂÉÎÁŇÎŮČ ĐÁËĹÔĎ×\n"
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁŔ ÂÉÎÁŇÎŮĹ ĐÁËĹÔŮ\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ÚÁÄÁĹÔ ÎĹÓËĎĚŘËĎ ĐÁËĹÔĎ×\n"
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "ŐÄÁĚĹÎÉĹ ÜÔÉČ ĐÁËĹÔĎ× ÎÁŇŐŰÉÔ ÚÁ×ÉÓÉÍĎÓÔÉ:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "őÓÔÁÎÁ×ĚÉ×ÁŔ %s\n"
@@ -3759,22 +3759,18 @@ msgstr "ćÁĘĚ %s: %s"
msgid "File %s is smaller than %d bytes"
msgstr "ćÁĘĚ %s ÍĹÎŘŰĹ %d ÂÁĘÔ"
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "ĎŰÉÂËÁ: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "ĆÁÔÁĚŘÎÁŃ ĎŰÉÂËÁ: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr "×ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ (ÂÁÇÁ rpm): "
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3820,6 +3816,9 @@ msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s: %s\n"
msgid "failed to create %s: %s\n"
msgstr "ÎĹ ÍĎÇŐ ÓĎÚÄÁÔŘ %s\n"
+#~ msgid "internal error (rpm bug?): "
+#~ msgstr "×ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ (ÂÁÇÁ rpm): "
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ ×ÔĎŇĎĹ ':' × %s:%d"
diff --git a/po/sk.po b/po/sk.po
index 570633a02..e80d05990 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "nie je možné otvoriť %s/packages.rpm\n"
@@ -1114,40 +1114,40 @@ msgstr "--sign môže byť použíté iba počas zostavenia balíka"
msgid "exec failed\n"
msgstr "vykonanie zlyhalo\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "neočakávané argumenty pre --querytags"
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "neboli zadané žiadne balíky pre overenie podpisu"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "neboli zadané žiadne balíky na podpis"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "neboli zadané žiadne balíky pre odinštalovanie"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "neboli zadané žiadne balíky pre inštaláciu"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "boli zadané nadbytočné argumenty otázky pre všetky balíky"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "neboli zadané žiadne argumenty pre otázku"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
#, 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:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "neboli zadané žiadne argumenty pre overenie"
@@ -1562,11 +1562,11 @@ msgstr "--justdb môže byť použité iba počas inštalácie a odstránenia balíka"
msgid "no packages files given for rebuild"
msgstr "neboli zadané žiadne balíky pre znovuzostavenie"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "neboli zadané žiadne spec-súbory pre zostavenie"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "neboli zadané žiadne tar-súbory pre zostavenie"
@@ -1941,7 +1941,7 @@ msgstr "Nie je možné vytvoriť meno výstupného súboru pre balík %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "nie je možné zapísať do %s: "
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr "riadok %d: druhý %s"
@@ -1974,17 +1974,17 @@ msgstr "žiadny popis v %%changelog"
msgid "line %d: Error parsing %%description: %s"
msgstr "riadok %d: Chyba pri analýze %%description: %s"
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr "riadok %d: Chybná voľba %s: %s"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr "riadok %d: Priveľa názvov: %s"
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr "riadok %d: Balík neexistuje: %s"
@@ -1994,11 +1994,11 @@ msgstr "riadok %d: Balík neexistuje: %s"
msgid "line %d: Second description"
msgstr "riadok %d: Druhý popis"
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr "riadok %d: Chyba pri analýze %%files: %s"
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr "riadok %d: Druhý %%files zoznam"
@@ -2063,7 +2063,7 @@ msgstr "riadok %d: Prázdny popis: %s"
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "riadok %d: Neprípustný znak '-' v %s: %s"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, fuzzy, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr "riadok %d: BuildRoot nemôže byť \"/\": %s"
@@ -2093,22 +2093,22 @@ msgstr "riadok %d: Chybný formát BuildArchitecture: %s"
msgid "Internal error: Bogus tag %d"
msgstr "Interná chyba: Čudný popis %d "
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr "Chybná špecifikácia balíka: %s"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr "Balík už existuje: %s"
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr "riadok %d: Neznámy popis: %s"
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr "Spec súbor nemôže použiť BuildRoot"
@@ -2168,7 +2168,7 @@ msgstr "Priveľa záplat!"
msgid "line %d: Bad arg to %%patch: %s"
msgstr "riadok %d: Chybný argument pre %%patch: %s"
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr "riadok %d: druhý %%prep"
@@ -2193,65 +2193,65 @@ msgstr "riadok %d: Názvy súborov v %s neobsahujú verzie: %s"
msgid "line %d: Version required: %s"
msgstr "riadok %d: V %s sú vyžadované verzie: %s"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr "riadok %d: triggers musia obsahovať --: %s"
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr "riadok %d: Chyba pri analýze %s: %s"
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr "riadok %d: program skriptu musí začínať '/': %s"
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr "riadok %d: Druhý %s"
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr "riadok %d: %s"
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, fuzzy, c-format
msgid "Unable to open %s: %s\n"
msgstr "otvorenie zlyhalo: %s\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr "Neuzavretý %%if"
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr "%s:%d: %%else bez if"
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr "%s:%d: %%endif bez if"
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr "znetvorený príkaz %%include"
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr "Žiadne zostaviteľné architektúry"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr "Balík neobsahuje %%description: %s"
@@ -2706,39 +2706,39 @@ msgstr "zdrojový balík neobsahuje žiadny .spec súbor"
msgid "renaming %s to %s\n"
msgstr "premenováva sa %s na %s\n"
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "premenovanie %s na %s zlyhalo: %s"
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr "očakávaný zdrojový balík, nájdený binárny"
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "balík: %s-%s-%s test súborov = %d\n"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr "inštalácia zastavená kvôli režimu --test\n"
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr "vykonávajú sa predinštalačné skripty (ak existujú)\n"
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr "varovanie: %s vytvorené ako %s"
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr "varovanie: %s uchovaný ako %s"
-#: lib/install.c:1154
+#: lib/install.c:1155
#, fuzzy
msgid "running postinstall scripts (if any)\n"
msgstr "vykonávajú sa poinštalačné skripty (ak existujú)\n"
@@ -3049,81 +3049,81 @@ msgid "can't query %s: %s\n"
msgstr "zmazanie %s zlyhalo: %s\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "otvorenie %s zlyhalo\n"
-#: lib/query.c:515
+#: lib/query.c:514
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:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, 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:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr "otázka na %s zlyhala\n"
-#: lib/query.c:561
+#: lib/query.c:560
#, 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:584
+#: lib/query.c:583
#, fuzzy
msgid "no packages\n"
msgstr "nájdených %d balíkov\n"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s neobsahuje žiadne balíky\n"
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr "žiadny z balíkov nespúšťa %s\n"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr "žiadny z balíkov nevyžaduje %s\n"
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr "žiadny z balíkov neposkytuje %s\n"
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr "súbor %s: %s\n"
-#: lib/query.c:658
+#: lib/query.c:657
#, 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:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "chybné číslo balíku: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "požaduje sa záznam číslo %d\n"
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr "záznam %d nie je možné prečítať\n"
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr "balík %s nie je nainštalovaný\n"
@@ -3404,104 +3404,104 @@ 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:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr "počítajú sa balíky pre inštaláciu\n"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr "nájdených %d balíkov\n"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr "hľadajú sa balíky, ktoré treba preniesť\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "%s vynechané - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, 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:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr "... ako %s\n"
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s vynechané - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr "prenieslo sa %d balíkov\n"
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie je možné otvoriť súbor %s: %s"
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie je možné nainštalovať\n"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nie je možné otvoriť %s/packages.rpm\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "balík %s nie je nainštalovaný\n"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pri vytváraní dočasného súboru %s"
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, 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:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "nevyriešené závislosti:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr "inštalujú sa binárne balíky\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" špecifikuje viac balíkov\n"
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "odstránenie týchto balíkov by porušilo závislosti:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie je možné otvoriť %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "Inštaluje sa %s\n"
@@ -3870,22 +3870,18 @@ msgstr "Súbor %s: %s"
msgid "File %s is smaller than %d bytes"
msgstr "Súbor %s je menší ako %d bajtov"
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "varovanie: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "chyba: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "fatálna chyba: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr "interná chyba (chyba rpm?): "
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3931,6 +3927,9 @@ msgstr "nepodarilo sa otvoriť %s: %s"
msgid "failed to create %s: %s\n"
msgstr "nepodarilo sa vytvoriť %s\n"
+#~ msgid "internal error (rpm bug?): "
+#~ msgstr "interná chyba (chyba rpm?): "
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "chýbajúce druhé ':' na %s:%d"
diff --git a/po/sl.po b/po/sl.po
index 40f362eab..81b9c99e9 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.96 2000/08/29 22:04:38 jbj Exp $
+# $Id: sl.po,v 1.97 2000/08/31 02:39:00 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-0400\n"
"PO-Revision-Date: 2000-02-17 22:25+01:00\n"
"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "datoteke %s/packages.rpm ni možno odpreti\n"
@@ -1103,39 +1103,39 @@ msgstr "--sign smemo podati samo ob izgradnji paketa"
msgid "exec failed\n"
msgstr "exec neuspešen\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "nepričakovani argumenti za --querytags "
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "paketi za preverjanje podpisa niso navedeni"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "paketi za podpisovanje niso navedeni"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "paketi za odstranitev niso navedeni"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "paketi za namestitev niso navedeni"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "pri poizvedbi paketov so podani odvečni argumenti"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "argumenti za poizvedbo niso podani"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr "pri preverjanju paketov so podani odvečni argumenti"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "argumenti za preverjanje niso podani"
@@ -1549,11 +1549,11 @@ msgstr "--justdb smemo podati samo ob namestitvi ali odstranitvi paketa"
msgid "no packages files given for rebuild"
msgstr "paketi za vnovično izgradnjo niso navedeni"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "datoteka spec za izgradnjo manjka"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "arhiv tar za izgradnjo manjka"
@@ -1923,7 +1923,7 @@ msgstr "Neuspešno ustvarjanje izhodne datoteke za paket %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "ni možno ustvariti %s: %s\n"
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr "vrstica %d: %s sekund"
@@ -1956,17 +1956,17 @@ msgstr "opis v %%changelog manjka"
msgid "line %d: Error parsing %%description: %s"
msgstr "vrstica %d: Napaka pri razčlembi v razdelku %%description: %s"
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr "vrstica %d: Okvarjena izbira %s: %s"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr "vrstica %d: Preveč imen: %s"
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr "vrstica %d: Paket ne obstaja: %s"
@@ -1976,11 +1976,11 @@ msgstr "vrstica %d: Paket ne obstaja: %s"
msgid "line %d: Second description"
msgstr "vrstica %d: Drugi opis"
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr "vrstica %d: Napaka pri razčlembi v razdelku %%Files: %s"
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr "vrstica %d: Drugi seznam %%Files"
@@ -2045,7 +2045,7 @@ msgstr "vrstica %d: Prazna značka: %s"
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "vrstica %d: Neveljaven znak ,-` v %s: %s"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr "BuildRoot ne more biti \"/\": %s"
@@ -2075,22 +2075,22 @@ msgstr "vrstica %d: okvarjena oblika BuildArchitecture: %s"
msgid "Internal error: Bogus tag %d"
msgstr "Interna napaka: Neprava značka %d"
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr "Okvarjeno določilo paketa: %s"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr "Paket že obstaja: %s"
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr "vrstica %d: Neznana značka: %s"
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr "Datoteka spec ne more uporabiti BuildRoot"
@@ -2150,7 +2150,7 @@ msgstr "Preveč krparij!"
msgid "line %d: Bad arg to %%patch: %s"
msgstr "vrstica %d: Okvarjen argument za %%patch: %s"
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr "vrstica %d: drugi %%prep"
@@ -2177,65 +2177,65 @@ msgstr "vrstica %d: Ime datoteke z različico ni dovoljeno: %s"
msgid "line %d: Version required: %s"
msgstr "vrstica %d: Zahtevana različica: %s"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr "vrstica %d: prožila morajo vsebovati --: %s"
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr "vrstica %d: Napaka pri razčlembi %s: %s"
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr "vrstica %d: skriptni program se mora začeti z ,/`: %s"
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr "vrstica %d: Drugi %s"
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr "vrstica %d: %s"
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr "Ni možno odpreti %s: %s\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr "Nezaključeni %%if"
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr "%s:%d: parseExpressionBoolean vrne %d"
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr "%s:%d: Najden %%else brez pripadajočega if"
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr "%s:%d: Najden %%endif brez pripadajočega if"
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr "Deformiran stavek %%include"
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr "Arhitektura za izgradnjo manjka"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr "V paketu manjka %%description: %s"
@@ -2696,39 +2696,39 @@ msgstr "izvorni paket ne vsebuje datoteke .spec"
msgid "renaming %s to %s\n"
msgstr "preimenujemo %s v %s\n"
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "preimenovanje %s v %s neuspešno: %s"
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr "pričakovan izvorni paket, najden binarni"
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paket: %s-%s-%s datoteke test = %d\n"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr "ustavljamo namestitev ker tečemo kot --test\n"
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr "poganjamo prednamestitvene skripte (če obstajajo)\n"
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr "opozorilo: %s ustvarjen kot %s"
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr "opozorilo: %s shranjen kot %s"
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr "poganjamo ponamestitvene skripte (če obstajajo)\n"
@@ -3036,81 +3036,81 @@ msgid "can't query %s: %s\n"
msgstr "ni možno zbrisati %s: %s\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr "odpiranje %s neuspešno: %s\n"
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr "poizvedba po izvornih paketih v stari obliki ni možna\n"
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s najverjetneje ni paket RPM\n"
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr "poizvedba po %s neuspešna\n"
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "poizvedba po datoteki spec %s neuspešna, razčlemba ni možna\n"
-#: lib/query.c:584
+#: lib/query.c:583
#, fuzzy
msgid "no packages\n"
msgstr "najdeno %d paketov\n"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "skupina %s ne vsebuje nobenega paketa\n"
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr "noben paket ne proži %s\n"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr "noben paket ne potrebuje %s\n"
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr "noben paket ne nudi %s\n"
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr "datoteka %s: %s\n"
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "datoteka %s ni del nobenega paketa\n"
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "neveljavna številka paketa: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "številka zapisa paketa: %d\n"
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr "zapisa %d ni možno prebrati\n"
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s ni nameščen\n"
@@ -3389,104 +3389,104 @@ msgstr "ustvarjamo imenik: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "neuspešna odstranitev imenika %s: %s\n"
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr "štetje paketov za namestitev\n"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr "najdeno %d paketov\n"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr "iskanje paketov za prenos po omrežju\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "preskakujemo %s - rpmGlob neuspešen(%d)\n"
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr "Prenašamo %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr " ... kot %s\n"
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "preskakujemo %s - prenos neuspešen - %s\n"
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr "prenesli smo %d paketov\n"
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ni možno odpreti datoteke %s: %s\n"
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ni možno namestiti\n"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "paketa ni možno odpreti: %s\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paketa %s ni možno prestaviti\n"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr "napaka pri branju iz datoteke %s\n"
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, 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:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "najdeno %d izvornih in %d binarnih paketov\n"
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "neuspešne soodvisnosti:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr "nameščamo binarne pakete\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" določa večterne pakete\n"
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ni možno odpreti %s: %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "Nameščamo %s\n"
@@ -3850,22 +3850,18 @@ msgstr "Datoteka %s: %s"
msgid "File %s is smaller than %d bytes"
msgstr "Datoteka %s je krajša od %d bajtov"
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "opozorilo: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "napaka: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "usodna napaka: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr "interna napaka (hrošč v rpm?): "
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3911,6 +3907,9 @@ msgstr "neuspešno odpiranje %s: %s\n"
msgid "failed to create %s: %s\n"
msgstr "neuspešno ustvarjanje %s: %s\n"
+#~ msgid "internal error (rpm bug?): "
+#~ msgstr "interna napaka (hrošč v rpm?): "
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "manjka drugi ,:` v %s:%d"
diff --git a/po/sr.po b/po/sr.po
index c7aca367a..53ad0330e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,13 +1,13 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
"Xgettext-Options: --default-domain=rpm --add-comments --keyword=_ "
"--keyword=N_\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n"
@@ -1115,40 +1115,40 @@ msgstr "--sign se može koristiti samo kod kreiranja paketa"
msgid "exec failed\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "neočekivani argumenti za --querytags"
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "nedostaje paket za proveru potpisa"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "nedostaje paket za potpisivanje"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "neodstaje paket za deinstalaciju"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "nedostaje paket za instalaciju"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "suvišni argumenti su navedeni za upit nad svim paketima"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "nedostaju argumenti za upit"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "suvišni argumenti su navedeni za upit nad svim paketima"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "nedostaju argumenti za proveru"
@@ -1553,11 +1553,11 @@ msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
msgid "no packages files given for rebuild"
msgstr "nedosataje paket za rekreiranje"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "nedostaje specifikacije za kreiranje"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "nedostaju 'tar' datoteke za kreiranje"
@@ -1933,7 +1933,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1966,17 +1966,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, fuzzy, c-format
msgid "line %d: Bad option %s: %s"
msgstr "neuspelo otvaranje %s: %s"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, fuzzy, c-format
msgid "line %d: Package does not exist: %s"
msgstr "paket %s nije naveden u %s"
@@ -1986,11 +1986,11 @@ msgstr "paket %s nije naveden u %s"
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -2055,7 +2055,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "neuspelo otvaranje %s: %s"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -2085,22 +2085,22 @@ msgstr "nedostaje arhitektura za %s na %s:%d"
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, fuzzy, c-format
msgid "Bad package specification: %s"
msgstr " Opcije odrednice paketa:"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2160,7 +2160,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2185,66 +2185,66 @@ msgstr "paket %s nije naveden u %s"
msgid "line %d: Version required: %s"
msgstr "neuspelo otvaranje %s: %s"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, fuzzy, c-format
msgid "line %d: %s"
msgstr "neuspelo otvaranje %s: %s"
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, fuzzy, c-format
msgid "Unable to open %s: %s\n"
msgstr "neuspelo otvaranje %s\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
#, fuzzy
msgid "No buildable architectures"
msgstr "nemoj proveravati arhitekturu paketa"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
#, fuzzy
msgid "Package has no %%description: %s"
msgstr "paket %s nije naveden u %s"
@@ -2707,39 +2707,39 @@ msgstr "upit nad paketom koji ima <datoteku>"
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "preimenovanje %s u %s nije uspelo: %s"
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paket %s-%s-%s sadrži deljene datoteke\n"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -3061,81 +3061,81 @@ msgid "can't query %s: %s\n"
msgstr "greška: ne mogu da otvorim %s\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "neuspelo otvaranje %s: %s\n"
-#: lib/query.c:515
+#: lib/query.c:514
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:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, 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:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr "upit nad %s neuspeo\n"
-#: lib/query.c:561
+#: lib/query.c:560
#, fuzzy, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "upit nad %s neuspeo\n"
-#: lib/query.c:584
+#: lib/query.c:583
#, fuzzy
msgid "no packages\n"
msgstr "upit nad svim paketima"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupa %s ne sadrži nijedan paket\n"
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr "nijedan paket ne aktivira %s\n"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr "nijedan paket ne zahteva %s\n"
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr "nijedan paket ne obezbeđuje %s\n"
-#: lib/query.c:655
+#: lib/query.c:654
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "pogrešan broj paketa: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "pogrešan broj paketa: %s\n"
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr "ne mogu da pročitam slog %d\n"
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
@@ -3414,107 +3414,107 @@ msgstr "greška kod kreiranja direktorijuma %s: %s"
msgid "failed to remove directory %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
#, fuzzy
msgid "counting packages to install\n"
msgstr "nedostaje paket za instalaciju"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, fuzzy, c-format
msgid "found %d packages\n"
msgstr "upit nad svim paketima"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
#, fuzzy
msgid "looking for packages to download\n"
msgstr "greška kod potrage za paketom %s\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr "Pribavljam %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "greška: %s se ne može instalirati\n"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, 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:279
+#: lib/rpminstall.c:280
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s nije instaliran\n"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "grupa %s ne sadrži nijedan paket\n"
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "loše međuzavisnosti:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
#, fuzzy
msgid "installing binary packages\n"
msgstr "instaliraj paket"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" određuje više paketa\n"
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "uklanjanje oviha paketa će narušiti zavisnosti:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "greška: ne mogu da otvorim %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
@@ -3898,22 +3898,18 @@ msgstr "neuspelo otvaranje %s: %s"
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "upozorenje: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "greška: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "fatalna greška: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/sv.po b/po/sv.po
index 71860b51d..38224f30e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-0400\n"
"PO-Revision-Date: 2000-08-07 16:53+0200\n"
"Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "kan inte öppna %s/packages.rpm\n"
@@ -1069,39 +1069,39 @@ msgstr "--sign kan enbart användas vid pakettillverkning"
msgid "exec failed\n"
msgstr "exec misslyckades\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "oväntade argument till --querytags "
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "inga paket angivna för signaturkontroll"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "inga paket angivna för signering"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "inga paket angivna för avinstallation"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "inga paket angivna för installation"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "extra argument angivna för förfrĺgan om alla paket"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "inga parametrar angivna för undersökning"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr "extra argument angivna för verifiering av alla paket"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "inga parametrar angivna för verifiering"
@@ -1458,11 +1458,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr "inga paketfiler angivna för omtillverkning"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "ingen spec-filer angivna för tillverkning"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "inga tar-filer angivna för tillverkning"
@@ -1831,7 +1831,7 @@ msgstr "Kunde inte generera utfilnamn för paketet %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "kan inte skapa %s: %s\n"
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr "rad %d: andra %s"
@@ -1864,17 +1864,17 @@ msgstr "ingen beskrivning i %%changelog"
msgid "line %d: Error parsing %%description: %s"
msgstr "rad %d: Fel i parsning av %%description: %s"
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr "rad %d: otillĺten flagga %s: %s"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr "rad %d: För mĺnga namn: %s"
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr "rad %d: Paketet existerar inte: %s"
@@ -1884,11 +1884,11 @@ msgstr "rad %d: Paketet existerar inte: %s"
msgid "line %d: Second description"
msgstr "rad %d: En andra beskrivning"
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr "rad %d: Fel i parsning av %%files: %s"
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr "rad %d: En andra %%files-lista"
@@ -1953,7 +1953,7 @@ msgstr "rad %d: Tom tagg: %s"
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "rad %d: Otillĺtet tecken \"-\" i %s: %s"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr "BuildRoot kan inte vara \"/\": %s"
@@ -1983,22 +1983,22 @@ msgstr "rad %d: Felaktig BuildArchitecture-format: %s"
msgid "Internal error: Bogus tag %d"
msgstr "Internt fel: felaktig tagg %d"
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr "Felaktig paketspecifikation: %s"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr "Paketet existerar redan: %s"
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr "rad %d: Okänd tagg: %s"
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr "Spec-fil kan inte använda BuildRoot"
@@ -2058,7 +2058,7 @@ msgstr "För mĺnga patchar!"
msgid "line %d: Bad arg to %%patch: %s"
msgstr "rad %d: Felaktigt argument till %%patch: %s"
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr "rad %d: andra %%prep"
@@ -2083,65 +2083,65 @@ msgstr "rad %d: Versionsfilnamn inte tillĺtet: %s"
msgid "line %d: Version required: %s"
msgstr "rad %d: Version krävs: %s"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr "rad %d: utlösare mĺste ha --: %s"
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr "rad %d: Fel vid parsning av %s: %s"
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr "rad %d: skriptprogram mĺste börja med \"/\": %s"
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr "rad %d: En andra %s"
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr "rad %d: %s"
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr "Kan inte öppna %s: %s\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr "Oavslutat %%if"
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr "%s:%d: parseExpressionBoolean returnerar %d"
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr "%s:%d: Fick ett %%else utan nĺgot if"
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr "%s:%d: Fick ett %%endif utan nĺgot if"
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr "felformaterad %%include-sats"
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr "Inga byggbara arkitekturer"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr "Paketet har ingen %%description: %s"
@@ -2603,39 +2603,39 @@ msgstr "källpaket innehĺller ingen spec-fil"
msgid "renaming %s to %s\n"
msgstr "byter namn pĺ %s till %s\n"
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "namnbyte frĺn %s till %s misslyckades: %s"
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr "källpaket förväntades, fann binärpaket"
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "paket: %s-%s-%s filtest = %d\n"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr "avbryter installation eftersom vi kör --test\n"
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr "kör (eventuellt) preinstalltionsskript\n"
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr "varning: %s skapades som %s"
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr "varning: %s sparades som %s"
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr "kör (eventuellt) postinstallationsskript\n"
@@ -2929,80 +2929,80 @@ msgid "can't query %s: %s\n"
msgstr "kan inte frĺga om %s: %s\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr "misslyckades öppna %s: %s\n"
-#: lib/query.c:515
+#: lib/query.c:514
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:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, 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:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr "frĺga om %s misslyckades\n"
-#: lib/query.c:561
+#: lib/query.c:560
#, 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:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr "inga paket\n"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "grupp %s innehĺller inga paket\n"
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr "inga paketutlösare %s\n"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr "inget paket behöver %s\n"
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr "inget paket tillhandahĺller %s\n"
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "filen %s ägs inte av nĺgot paket\n"
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "felaktigt paketnummer: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr "paketpost nummer: %u\n"
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr "post %d kunde inte läsas\n"
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s är inte installerat\n"
@@ -3305,104 +3305,104 @@ 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:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr "räknar paket att installera\n"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr "hittade %d paket\n"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr "letar efter paket att hämta\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "hoppar över %s - rpmGlob misslyckades(%d)\n"
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, 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:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hoppar över %s - överföring misslyckades - %s\n"
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr "hämtade %d paket\n"
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kan inte öppna filen %s: %s\n"
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kan inte installeras\n"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kan inte öppna paketdatabas i %s\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s är inte relokerbart\n"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr "fel vid läsning frĺn fil %s\n"
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, 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:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "hittade %d käll- och %d binärpaket\n"
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "ouppfyllda beroenden:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr "installerar binärpaket\n"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" anger flera paket\n"
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "Installerar %s\n"
@@ -3766,22 +3766,18 @@ msgstr "Fil %s: %s"
msgid "File %s is smaller than %d bytes"
msgstr "Filen %s är mindre än %d byte"
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "varning: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "fel: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "fatalt fel: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr "internt fel (fel i rpm?): "
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3827,6 +3823,9 @@ msgstr "kunde inte öppna %s: %s\n"
msgid "failed to create %s: %s\n"
msgstr "kunde inte skapa %s: %s\n"
+#~ msgid "internal error (rpm bug?): "
+#~ msgstr "internt fel (fel i rpm?): "
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "andra \":\" saknas vid %s:%d"
diff --git a/po/tr.po b/po/tr.po
index 2fee5a053..6798ad95f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
@@ -1154,40 +1154,40 @@ msgstr "--sign sadece paket olusturulurken kullanýlabilir"
msgid "exec failed\n"
msgstr "%s: Eriţilemedi\n"
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr "--querytags için beklenmeyen argümanlar"
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr "imzasý kontrol edilecek paketler belirtilmedi"
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr "imzalanacak paketler belirtilmedi"
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr "sistemden silinecek paketler belirtilmedi"
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr "yüklenecek paketler belirtilmedi"
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr "tüm paketlerin sorgulanmasý için fazladan argümanlar belirtildi"
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr "sorgulama için hiç argüman belirtilmedi"
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "tüm paketlerin sorgulanmasý için fazladan argümanlar belirtildi"
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr "dođrulama için hiç argüman belirtilmedi"
@@ -1600,11 +1600,11 @@ msgstr "--justdb sadece paket yükleme ve silmelerinde kullanýlýr"
msgid "no packages files given for rebuild"
msgstr "yeniden oluţturmak için paket dosyalarý belirtilmedi"
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr "oluţturma için gerekli spec dosyasý belirtilmedi"
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr "oluţturma için gereken tar dosyalarý belirttilmedi"
@@ -1981,7 +1981,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr "%s dosyasý açýlamýyor: "
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -2014,17 +2014,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, fuzzy, c-format
msgid "line %d: Bad option %s: %s"
msgstr "%s açýlamadý: %s"
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, fuzzy, c-format
msgid "line %d: Package does not exist: %s"
msgstr "%s paketi %s altýnda gözükmüyor"
@@ -2034,11 +2034,11 @@ msgstr "%s paketi %s altýnda gözükmüyor"
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -2103,7 +2103,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr "%s açýlamadý: %s"
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -2133,22 +2133,22 @@ msgstr "%s için %s te eksik mimari:%d"
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, fuzzy, c-format
msgid "Bad package specification: %s"
msgstr " Paket seçim seçenekleri:"
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2208,7 +2208,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2233,67 +2233,67 @@ msgstr "%s paketi %s altýnda gözükmüyor"
msgid "line %d: Version required: %s"
msgstr "%s açýlamadý: %s"
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, fuzzy, c-format
msgid "line %d: %s"
msgstr "%s açýlamadý: %s"
# , c-format
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, fuzzy, c-format
msgid "Unable to open %s: %s\n"
msgstr "%s 'ye eriţimde hata oluţtu\n"
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
#, fuzzy
msgid "No buildable architectures"
msgstr "paket mimarisini dođrulamaz"
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
#, fuzzy
msgid "Package has no %%description: %s"
msgstr "%s paketi %s altýnda gözükmüyor"
@@ -2756,39 +2756,39 @@ msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr "%s 'nin isminin %s 'ye çevrilmesinde belirtilen hata oluţtu: %s"
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, fuzzy, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -3114,81 +3114,81 @@ msgid "can't query %s: %s\n"
msgstr "hata: %s eriţilemiyor\n"
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "%s 'ye erisimde belirtilen hata oluţtu: %s\n"
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr "eski tip kaynak paketleri sorgulanamýyor\n"
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, 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:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr "%s 'nin sorgulamasý baţarýsýzlýkla sonuçlandý\n"
-#: lib/query.c:561
+#: lib/query.c:560
#, 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:584
+#: lib/query.c:583
#, fuzzy
msgid "no packages\n"
msgstr "Tüm paketleri sorgulama"
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr "%s grubu hiç paket içermiyor\n"
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr "hiç bir paket %s tetiklemiyor\n"
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr "hiç bir paket %s gerektirmiyor\n"
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr "hiç bir paket %s sađlamýyor\n"
-#: lib/query.c:655
+#: lib/query.c:654
#, fuzzy, c-format
msgid "file %s: %s\n"
msgstr "%s açýlamadý: %s"
-#: lib/query.c:658
+#: lib/query.c:657
#, 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:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr "geçersiz paket numarsý: %s\n"
-#: lib/query.c:687
+#: lib/query.c:686
#, fuzzy, c-format
msgid "package record number: %u\n"
msgstr "geçersiz paket numarsý: %s\n"
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr "%d numaralý kayýt okunamadý\n"
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr "%s pakedi yüklenmemiţ\n"
@@ -3467,107 +3467,107 @@ msgstr "%s dizinin oluţturulmasýnda hata: %s"
msgid "failed to remove directory %s: %s\n"
msgstr "%s açýlamadý: %s"
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
#, fuzzy
msgid "counting packages to install\n"
msgstr "yüklenecek paketler belirtilmedi"
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, fuzzy, c-format
msgid "found %d packages\n"
msgstr "Tüm paketleri sorgulama"
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
#, fuzzy
msgid "looking for packages to download\n"
msgstr "%s pakedi aranýrken hata oluţtu\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, 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:173
+#: lib/rpminstall.c:174
#, 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:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, 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:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s dosyasý açýlamýyor: "
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "hata: %s yüklenemedi\n"
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "%s pakedi yüklenmemiţ\n"
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "%s dizinin oluţturulmasýnda hata: %s"
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%s grubu hiç paket içermiyor\n"
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr "bađýmlýlýk hatasý, aţađýdaki paketlere ihtiyacýnýz var:\n"
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
#, fuzzy
msgid "installing binary packages\n"
msgstr "paket yüklemek"
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" birden fazla paketi tanýmlýyor\n"
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr "bu paketin silinmesi aţađýdaki bađýmlýlýklarý etkileyecektir:\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "hata: %s eriţilemiyor\n"
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr "%s yükleniyor\n"
@@ -3951,22 +3951,18 @@ msgstr "%s açýlamadý: %s"
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr "uyarý: "
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr "hata: "
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr "ölümcül hata: "
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/uk.po b/po/uk.po
index d4b636fcb..f12668c63 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1034,39 +1034,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1416,11 +1416,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1789,7 +1789,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1822,17 +1822,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1842,11 +1842,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1911,7 +1911,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1941,22 +1941,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2016,7 +2016,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2041,65 +2041,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2554,39 +2554,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2877,80 +2877,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3686,22 +3686,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/wa.po b/po/wa.po
index d4b636fcb..f12668c63 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1034,39 +1034,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1416,11 +1416,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1789,7 +1789,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1822,17 +1822,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1842,11 +1842,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1911,7 +1911,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1941,22 +1941,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2016,7 +2016,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2041,65 +2041,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2554,39 +2554,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2877,80 +2877,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3686,22 +3686,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/zh.po b/po/zh.po
index d4b636fcb..f12668c63 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1034,39 +1034,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1416,11 +1416,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1789,7 +1789,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1822,17 +1822,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1842,11 +1842,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1911,7 +1911,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1941,22 +1941,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2016,7 +2016,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2041,65 +2041,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2554,39 +2554,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2877,80 +2877,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3686,22 +3686,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index d4b636fcb..f12668c63 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -1034,39 +1034,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
msgid "no arguments given for verify"
msgstr ""
@@ -1416,11 +1416,11 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1312
+#: rpmqv.c:1311
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1314
+#: rpmqv.c:1313
msgid "no tar files given for build"
msgstr ""
@@ -1789,7 +1789,7 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
#, c-format
msgid "line %d: second %s"
msgstr ""
@@ -1822,17 +1822,17 @@ msgstr ""
msgid "line %d: Error parsing %%description: %s"
msgstr ""
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
#, c-format
msgid "line %d: Bad option %s: %s"
msgstr ""
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
#, c-format
msgid "line %d: Too many names: %s"
msgstr ""
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
#, c-format
msgid "line %d: Package does not exist: %s"
msgstr ""
@@ -1842,11 +1842,11 @@ msgstr ""
msgid "line %d: Second description"
msgstr ""
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
msgid "line %d: Error parsing %%files: %s"
msgstr ""
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
msgid "line %d: Second %%files list"
msgstr ""
@@ -1911,7 +1911,7 @@ msgstr ""
msgid "line %d: Illegal char '-' in %s: %s"
msgstr ""
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
#, c-format
msgid "BuildRoot can not be \"/\": %s"
msgstr ""
@@ -1941,22 +1941,22 @@ msgstr ""
msgid "Internal error: Bogus tag %d"
msgstr ""
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
#, c-format
msgid "Bad package specification: %s"
msgstr ""
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
#, c-format
msgid "Package already exists: %s"
msgstr ""
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
#, c-format
msgid "line %d: Unknown tag: %s"
msgstr ""
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
msgid "Spec file can't use BuildRoot"
msgstr ""
@@ -2016,7 +2016,7 @@ msgstr ""
msgid "line %d: Bad arg to %%patch: %s"
msgstr ""
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
msgid "line %d: second %%prep"
msgstr ""
@@ -2041,65 +2041,65 @@ msgstr ""
msgid "line %d: Version required: %s"
msgstr ""
-#: build/parseScript.c:142
+#: build/parseScript.c:141
#, c-format
msgid "line %d: triggers must have --: %s"
msgstr ""
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
#, c-format
msgid "line %d: Error parsing %s: %s"
msgstr ""
-#: build/parseScript.c:162
+#: build/parseScript.c:161
#, c-format
msgid "line %d: script program must begin with '/': %s"
msgstr ""
-#: build/parseScript.c:206
+#: build/parseScript.c:205
#, c-format
msgid "line %d: Second %s"
msgstr ""
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
#, c-format
msgid "line %d: %s"
msgstr ""
#. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
#, c-format
msgid "Unable to open %s: %s\n"
msgstr ""
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
msgid "Unclosed %%if"
msgstr ""
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
msgid "malformed %%include statement"
msgstr ""
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
msgid "No buildable architectures"
msgstr ""
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
msgid "Package has no %%description: %s"
msgstr ""
@@ -2554,39 +2554,39 @@ msgstr ""
msgid "renaming %s to %s\n"
msgstr ""
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
#, c-format
msgid "rename of %s to %s failed: %s"
msgstr ""
-#: lib/install.c:892
+#: lib/install.c:893
msgid "source package expected, binary found"
msgstr ""
-#: lib/install.c:939
+#: lib/install.c:940
#, c-format
msgid "package: %s-%s-%s files test = %d\n"
msgstr ""
-#: lib/install.c:999
+#: lib/install.c:1000
msgid "stopping install as we're running --test\n"
msgstr ""
-#: lib/install.c:1004
+#: lib/install.c:1005
msgid "running preinstall script (if any)\n"
msgstr ""
-#: lib/install.c:1029
+#: lib/install.c:1030
#, c-format
msgid "warning: %s created as %s"
msgstr ""
-#: lib/install.c:1066
+#: lib/install.c:1067
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/install.c:1154
+#: lib/install.c:1155
msgid "running postinstall scripts (if any)\n"
msgstr ""
@@ -2877,80 +2877,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:515
+#: lib/query.c:514
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:528
+#: lib/query.c:527
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:561
+#: lib/query.c:560
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:584
+#: lib/query.c:583
msgid "no packages\n"
msgstr ""
-#: lib/query.c:594
+#: lib/query.c:593
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:604
+#: lib/query.c:603
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:614
+#: lib/query.c:613
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:625
+#: lib/query.c:624
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:655
+#: lib/query.c:654
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:658
+#: lib/query.c:657
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:684
+#: lib/query.c:683
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:687
+#: lib/query.c:686
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:691
+#: lib/query.c:690
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3686,22 +3686,18 @@ msgstr ""
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
msgid "warning: "
msgstr ""
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
msgid "error: "
msgstr ""
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
msgid "fatal error: "
msgstr ""
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 0e1e44b2b..3756e1eed 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -6,12 +6,12 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/lib \
-I$(top_srcdir)/popt @INCPATH@
pkgincdir = $(pkgincludedir)
-pkginc_HEADERS = rpmio.h rpmurl.h rpmmacro.h rpmmessages.h rpmerr.h
+pkginc_HEADERS = rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h
noinst_HEADERS = rpmio_internal.h ugid.h
lib_LTLIBRARIES = librpmio.la
librpmio_la_SOURCES = rpmrpc.c rpmio.c rpmio_api.c url.c macro.c \
- ugid.c rpmmalloc.c rpmerr.c messages.c
+ ugid.c rpmmalloc.c rpmlog.c
# XXX Add internal libtool dependence
install-data-local:
diff --git a/rpmio/messages.c b/rpmio/messages.c
deleted file mode 100644
index 45c782f00..000000000
--- a/rpmio/messages.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#include "system.h"
-
-/** \ingroup rpmio
- * \file rpmio/messages.c
- */
-
-#include <stdarg.h>
-
-#include <rpmmessages.h>
-
-static int minLevel = RPMMESS_NORMAL;
-
-void rpmIncreaseVerbosity(void) {
- minLevel--;
-}
-
-void rpmSetVerbosity(int level) {
- minLevel = level;
-}
-
-int rpmGetVerbosity(void)
-{
- return minLevel;
-}
-
-int rpmIsDebug(void)
-{
- return (minLevel <= RPMMESS_DEBUG);
-}
-
-int rpmIsVerbose(void)
-{
- return (minLevel <= RPMMESS_VERBOSE);
-}
-
-void rpmMessage(rpmmsgLevel level, const char * format, ...) {
- va_list args;
-
- va_start(args, format);
- if (level >= minLevel) {
- switch (level) {
- case RPMMESS_VERBOSE:
- case RPMMESS_NORMAL:
- vfprintf(stdout, format, args);
- fflush(stdout);
- break;
-
- case RPMMESS_DEBUG:
- if (*format != '+')
- fprintf(stdout, "D: ");
- else
- format++;
- vfprintf(stdout, format, args);
- fflush(stdout);
- break;
-
- case RPMMESS_WARNING:
- if (*format != '+')
- fprintf(stderr, _("warning: "));
- else
- format++;
- vfprintf(stderr, format, args);
- fflush(stderr);
- break;
-
- case RPMMESS_ERROR:
- if (*format != '+')
- fprintf(stderr, _("error: "));
- else
- format++;
- vfprintf(stderr, format, args);
- fflush(stderr);
- break;
-
- case RPMMESS_FATALERROR:
- if (*format != '+')
- fprintf(stderr, _("fatal error: "));
- else
- format++;
- vfprintf(stderr, format, args);
- fflush(stderr);
- exit(EXIT_FAILURE);
- /*@notreached@*/ break;
-
- default:
- fprintf(stderr, _("internal error (rpm bug?): "));
- vfprintf(stderr, format, args);
- fflush(stderr);
- exit(EXIT_FAILURE);
- /*@notreached@*/ break;
-
- }
- }
-}
diff --git a/rpmio/rpmerr.c b/rpmio/rpmerr.c
deleted file mode 100644
index d447e7ec1..000000000
--- a/rpmio/rpmerr.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "system.h"
-
-/** \ingroup rpmio
- * \file rpmio/rpmerr.c
- */
-
-#include <stdarg.h>
-
-#include <rpmerr.h>
-/*@access rpmerrRec @*/
-
-static struct rpmerrRec_s _rpmerrRec;
-
-static rpmErrorCallBackType errorCallback = NULL;
-
-int rpmErrorCode(void)
-{
- return _rpmerrRec.code;
-}
-
-const char *rpmErrorCodeString(rpmerrCode code)
-{
- return NULL;
-}
-
-char *rpmErrorString(void)
-{
- return _rpmerrRec.string;
-}
-
-rpmErrorCallBackType rpmErrorSetCallback(rpmErrorCallBackType cb)
-{
- rpmErrorCallBackType ocb;
-
- ocb = errorCallback;
- errorCallback = cb;
-
- return ocb;
-}
-
-void rpmError(rpmerrCode code, const char *format, ...)
-{
- va_list args;
-
- va_start(args, format);
-
- _rpmerrRec.code = code;
- vsprintf(_rpmerrRec.string, format, args);
-
- if (errorCallback) {
- errorCallback();
- } else {
- fputs(_rpmerrRec.string, stderr);
- fputs("\n", stderr);
- }
-}
diff --git a/rpmio/rpmerr.h b/rpmio/rpmerr.h
index c3867e3e0..17b554731 100644
--- a/rpmio/rpmerr.h
+++ b/rpmio/rpmerr.h
@@ -3,118 +3,81 @@
/** \ingroup rpmio
* \file rpmio/rpmerr.h
+ * @todo Eliminate from API.
*/
+#include "rpmlog.h"
+
+#define _em(_e) \
+ (0x80000000 | ((_e) << 16) | RPMLOG_MAKEPRI(RPMLOG_ERRMSG, RPMLOG_ERR))
+
/**
* Tokens used by rpmError().
*/
typedef enum rpmerrCode_e {
- RPMERR_GDBMOPEN = -2, /*!< gdbm open failed */
- RPMERR_GDBMREAD = -3, /*!< gdbm read failed */
- RPMERR_GDBMWRITE = -4, /*!< gdbm write failed */
- RPMERR_INTERNAL = -5, /*!< internal RPM error */
- RPMERR_DBCORRUPT = -6, /*!< rpm database is corrupt */
- RPMERR_OLDDBCORRUPT = -7, /*!< old style rpm database is corrupt */
- RPMERR_OLDDBMISSING = -8, /*!< old style rpm database is missing */
- RPMERR_NOCREATEDB = -9, /*!< cannot create new database */
- RPMERR_DBOPEN = -10, /*!< database open failed */
- RPMERR_DBGETINDEX = -11, /*!< database get from index failed */
- RPMERR_DBPUTINDEX = -12, /*!< database get from index failed */
- RPMERR_NEWPACKAGE = -13, /*!< package is too new to handle */
- RPMERR_BADMAGIC = -14, /*!< bad magic for an RPM */
- RPMERR_RENAME = -15, /*!< rename(2) failed */
- RPMERR_UNLINK = -16, /*!< unlink(2) failed */
- RPMERR_RMDIR = -17, /*!< rmdir(2) failed */
- RPMERR_PKGINSTALLED = -18, /*!< package already installed */
- RPMERR_CHOWN = -19, /*!< chown() call failed */
- RPMERR_NOUSER = -20, /*!< user does not exist */
- RPMERR_NOGROUP = -21, /*!< group does not exist */
- RPMERR_MKDIR = -22, /*!< mkdir() call failed */
- RPMERR_FILECONFLICT = -23, /*!< file being installed exists */
- RPMERR_RPMRC = -24, /*!< bad line in rpmrc */
- RPMERR_NOSPEC = -25, /*!< .spec file is missing */
- RPMERR_NOTSRPM = -26, /*!< a source rpm was expected */
- RPMERR_FLOCK = -27, /*!< locking the database failed */
- RPMERR_OLDPACKAGE = -28, /*!< trying upgrading to old version */
-/* RPMERR_BADARCH = -29, bad architecture or arch mismatch */
- RPMERR_CREATE = -30, /*!< failed to create a file */
- RPMERR_NOSPACE = -31, /*!< out of disk space */
- RPMERR_NORELOCATE = -32, /*!< tried to do improper relocatation */
-/* RPMERR_BADOS = -33, bad architecture or arch mismatch */
- RPMMESS_BACKUP = -34, /*!< backup made during [un]install */
- RPMERR_MTAB = -35, /*!< failed to read mount table */
- RPMERR_STAT = -36, /*!< failed to stat something */
- RPMERR_BADDEV = -37, /*!< file on device not listed in mtab */
- RPMMESS_ALTNAME = -38, /*!< file written as .rpmnew */
- RPMMESS_PREREQLOOP = -39, /*!< loop in prerequisites */
- RPMERR_BADRELOCATE = -40, /*!< bad relocation was specified */
- RPMERR_OLDDB = -41, /*!< old format database */
+ RPMERR_GDBMOPEN = _em(2), /*!< gdbm open failed */
+ RPMERR_GDBMREAD = _em(3), /*!< gdbm read failed */
+ RPMERR_GDBMWRITE = _em(4), /*!< gdbm write failed */
+ RPMERR_INTERNAL = _em(5), /*!< internal RPM error */
+ RPMERR_DBCORRUPT = _em(6), /*!< rpm database is corrupt */
+ RPMERR_OLDDBCORRUPT = _em(7), /*!< old style rpm database is corrupt */
+ RPMERR_OLDDBMISSING = _em(8), /*!< old style rpm database is missing */
+ RPMERR_NOCREATEDB = _em(9), /*!< cannot create new database */
+ RPMERR_DBOPEN = _em(10), /*!< database open failed */
+ RPMERR_DBGETINDEX = _em(11), /*!< database get from index failed */
+ RPMERR_DBPUTINDEX = _em(12), /*!< database get from index failed */
+ RPMERR_NEWPACKAGE = _em(13), /*!< package is too new to handle */
+ RPMERR_BADMAGIC = _em(14), /*!< bad magic for an RPM */
+ RPMERR_RENAME = _em(15), /*!< rename(2) failed */
+ RPMERR_UNLINK = _em(16), /*!< unlink(2) failed */
+ RPMERR_RMDIR = _em(17), /*!< rmdir(2) failed */
+ RPMERR_PKGINSTALLED = _em(18), /*!< package already installed */
+ RPMERR_CHOWN = _em(19), /*!< chown() call failed */
+ RPMERR_NOUSER = _em(20), /*!< user does not exist */
+ RPMERR_NOGROUP = _em(21), /*!< group does not exist */
+ RPMERR_MKDIR = _em(22), /*!< mkdir() call failed */
+ RPMERR_FILECONFLICT = _em(23), /*!< file being installed exists */
+ RPMERR_RPMRC = _em(24), /*!< bad line in rpmrc */
+ RPMERR_NOSPEC = _em(25), /*!< .spec file is missing */
+ RPMERR_NOTSRPM = _em(26), /*!< a source rpm was expected */
+ RPMERR_FLOCK = _em(27), /*!< locking the database failed */
+ RPMERR_OLDPACKAGE = _em(28), /*!< trying upgrading to old version */
+/* RPMERR_BADARCH = _em(29), bad architecture or arch mismatch */
+ RPMERR_CREATE = _em(30), /*!< failed to create a file */
+ RPMERR_NOSPACE = _em(31), /*!< out of disk space */
+ RPMERR_NORELOCATE = _em(32), /*!< tried to do improper relocatation */
+/* RPMERR_BADOS = _em(33), bad architecture or arch mismatch */
+ RPMMESS_BACKUP = _em(34), /*!< backup made during [un]install */
+ RPMERR_MTAB = _em(35), /*!< failed to read mount table */
+ RPMERR_STAT = _em(36), /*!< failed to stat something */
+ RPMERR_BADDEV = _em(37), /*!< file on device not listed in mtab */
+ RPMMESS_ALTNAME = _em(38), /*!< file written as .rpmnew */
+ RPMMESS_PREREQLOOP = _em(39), /*!< loop in prerequisites */
+ RPMERR_BADRELOCATE = _em(40), /*!< bad relocation was specified */
+ RPMERR_OLDDB = _em(41), /*!< old format database */
/* spec.c build.c pack.c */
- RPMERR_UNMATCHEDIF = -107, /*!< unclosed %ifarch or %ifos */
- RPMERR_BADARG = -109, /*!< @todo Document. */
- RPMERR_SCRIPT = -110, /*!< errors related to script exec */
- RPMERR_READERROR = -111, /*!< @todo Document. */
- RPMERR_UNKNOWNOS = -112, /*!< @todo Document. */
- RPMERR_UNKNOWNARCH = -113, /*!< @todo Document. */
- RPMERR_EXEC = -114, /*!< @todo Document. */
- RPMERR_FORK = -115, /*!< @todo Document. */
- RPMERR_CPIO = -116, /*!< @todo Document. */
- RPMERR_GZIP = -117, /*!< @todo Document. */
- RPMERR_BADSPEC = -118, /*!< @todo Document. */
- RPMERR_LDD = -119, /*!< couldn't understand ldd output */
- RPMERR_BADFILENAME = -120, /*!< @todo Document. */
+ RPMERR_UNMATCHEDIF = _em(107), /*!< unclosed %ifarch or %ifos */
+ RPMERR_BADARG = _em(109), /*!< @todo Document. */
+ RPMERR_SCRIPT = _em(110), /*!< errors related to script exec */
+ RPMERR_READERROR = _em(111), /*!< @todo Document. */
+ RPMERR_UNKNOWNOS = _em(112), /*!< @todo Document. */
+ RPMERR_UNKNOWNARCH = _em(113), /*!< @todo Document. */
+ RPMERR_EXEC = _em(114), /*!< @todo Document. */
+ RPMERR_FORK = _em(115), /*!< @todo Document. */
+ RPMERR_CPIO = _em(116), /*!< @todo Document. */
+ RPMERR_GZIP = _em(117), /*!< @todo Document. */
+ RPMERR_BADSPEC = _em(118), /*!< @todo Document. */
+ RPMERR_LDD = _em(119), /*!< couldn't understand ldd output */
+ RPMERR_BADFILENAME = _em(120), /*!< @todo Document. */
- RPMERR_BADSIGTYPE = -200, /*!< Unknown signature type */
- RPMERR_SIGGEN = -201 /*!< Error generating signature */
+ RPMERR_BADSIGTYPE = _em(200), /*!< Unknown signature type */
+ RPMERR_SIGGEN = _em(201) /*!< Error generating signature */
} rpmerrCode;
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- */
-typedef void (*rpmErrorCallBackType)(void);
-
-/**
- */
-#if defined(__GNUC__)
-void rpmError(rpmerrCode code, const char * format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
-#else
-void rpmError(rpmerrCode code, const char * format, ...);
-#endif
-
-/**
- * @todo Implement or eliminate.
- * @return NULL always
- */
-/*@observer@*/ /*@null@*/ const char * rpmErrorCodeString( /*@unused@*/ rpmerrCode code);
-
-/**
- * @todo Implement or eliminate.
- */
-typedef /*@abstract@*/ struct rpmerrRec_s {
- rpmerrCode code;
- char string[1024];
-} * rpmerrRec;
-
/**
- * @return error record code
+ * Retrofit rpmError() onto rpmlog sub-system.
*/
-rpmerrCode rpmErrorCode(void);
-
-/**
- * @return error record string
- */
-char * rpmErrorString(void);
-
-/**
- */
-rpmErrorCallBackType rpmErrorSetCallback(rpmErrorCallBackType);
-
-#ifdef __cplusplus
-}
-#endif
+#define rpmError rpmlog
#endif /* H_RPMERR */
diff --git a/rpmio/rpmmessages.h b/rpmio/rpmmessages.h
index d2eaeef89..2830c5d34 100644
--- a/rpmio/rpmmessages.h
+++ b/rpmio/rpmmessages.h
@@ -3,20 +3,36 @@
/** \ingroup rpmio
* \file rpmio/rpmmessages.h
+ * @todo Eliminate from API.
*/
+#include "rpmlog.h"
+
+#define RPMMESS_DEBUG RPMLOG_DEBUG
+#define RPMMESS_VERBOSE RPMLOG_INFO
+#define RPMMESS_NORMAL RPMLOG_NOTICE
+#define RPMMESS_WARNING RPMLOG_WARNING
+#define RPMMESS_ERROR RPMLOG_ERR
+#define RPMMESS_FATALERROR RPMLOG_CRIT
+
+#define RPMMESS_QUIET RPMMESS_WARNING
+
+#define rpmMessage rpmlog
+#define rpmSetVerbosity(_lvl) \
+ ((void)rpmlogSetMask( RPMLOG_UPTO( RPMLOG_PRI(_lvl))))
+#define rpmIncreaseVerbosity() \
+ ((void)rpmlogSetMask((((rpmlogSetMask(0) & 0xff) << 1) | 1)))
+#define rpmDecreaseVerbosity() \
+ ((void)rpmlogSetMask(((rpmlogSetMask(0) & 0xff) >> 1)))
+#define rpmIsNormal() \
+ (rpmlogSetMask(0) & RPMLOG_MASK( RPMMESS_NORMAL ))
+#define rpmIsVerbose() \
+ (rpmlogSetMask(0) & RPMLOG_MASK( RPMMESS_VERBOSE ))
+#define rpmIsDebug() \
+ (rpmlogSetMask(0) & RPMLOG_MASK( RPMMESS_DEBUG ))
+
/**
*/
-typedef enum rpmmsgLevel_e {
- RPMMESS_DEBUG = 1, /*!< */
- RPMMESS_VERBOSE = 2, /*!< */
- RPMMESS_NORMAL = 3, /*!< */
- RPMMESS_WARNING = 4, /*!< */
- RPMMESS_ERROR = 5, /*!< */
- RPMMESS_FATALERROR = 6 /*!< */
-} rpmmsgLevel;
-#define RPMMESS_QUIET (RPMMESS_NORMAL + 1)
-
typedef enum rpmCallbackType_e {
RPMCALLBACK_INST_PROGRESS,
RPMCALLBACK_INST_START,
@@ -30,14 +46,14 @@ typedef enum rpmCallbackType_e {
RPMCALLBACK_UNINST_STOP
} rpmCallbackType;
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**
*/
typedef void * rpmCallbackData;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
*/
typedef void * (*rpmCallbackFunction)(const void * h,
@@ -52,35 +68,6 @@ typedef void * (*rpmCallbackFunction)(const void * h,
void urlSetCallback(rpmCallbackFunction notify, rpmCallbackData notifyData,
int notifyCount);
-/**
- */
-void rpmIncreaseVerbosity(void);
-
-/**
- */
-void rpmSetVerbosity(int level);
-
-/**
- */
-int rpmGetVerbosity(void);
-
-/**
- */
-int rpmIsVerbose(void);
-
-/**
- */
-int rpmIsDebug(void);
-
-/**
- */
-#if defined(__GNUC__)
-void rpmMessage(rpmmsgLevel level, const char * format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
-#else
-void rpmMessage(rpmmsgLevel level, const char * format, ...);
-#endif
-
-
#ifdef __cplusplus
}
#endif
diff --git a/rpmqv.c b/rpmqv.c
index 0d2a9ccd5..d170cb17a 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -1235,7 +1235,7 @@ int main(int argc, const char ** argv)
case MODE_REBUILD:
case MODE_RECOMPILE:
{ const char * pkg;
- if (rpmGetVerbosity() == RPMMESS_NORMAL)
+ if (rpmIsNormal())
rpmSetVerbosity(RPMMESS_VERBOSE);
if (!poptPeekArg(optCon))
@@ -1273,11 +1273,10 @@ int main(int argc, const char ** argv)
case MODE_BUILD:
case MODE_TARBUILD:
{ const char * pkg;
- if (rpmGetVerbosity() == RPMMESS_NORMAL)
+ if (rpmIsNormal())
rpmSetVerbosity(RPMMESS_VERBOSE);
switch (ba->buildChar) {
- /* these fallthroughs are intentional */
case 'a':
ba->buildAmount |= RPMBUILD_PACKAGESOURCE;
/*@fallthrough@*/