summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2010-06-29 11:59:33 +0300
committerPanu Matilainen <pmatilai@redhat.com>2010-06-29 11:59:33 +0300
commit6a37f166a81c302e18eb987ad6d42a7dd930ae9a (patch)
tree83decffe1561258e7faa00bc366467cca58e7a14
parent419bc7762dc2c9e35880b3ffc8058b8fbc33f62f (diff)
downloadlibrpm-tizen-6a37f166a81c302e18eb987ad6d42a7dd930ae9a.tar.gz
librpm-tizen-6a37f166a81c302e18eb987ad6d42a7dd930ae9a.tar.bz2
librpm-tizen-6a37f166a81c302e18eb987ad6d42a7dd930ae9a.zip
Update translations to pick up some recently added strings
-rw-r--r--po/ca.po241
-rw-r--r--po/cs.po241
-rw-r--r--po/da.po239
-rw-r--r--po/de.po241
-rw-r--r--po/es.po732
-rw-r--r--po/fi.po247
-rw-r--r--po/fr.po241
-rw-r--r--po/is.po239
-rw-r--r--po/it.po241
-rw-r--r--po/ja.po263
-rw-r--r--po/ko.po239
-rw-r--r--po/ms.po237
-rw-r--r--po/nb.po239
-rw-r--r--po/nl.po233
-rw-r--r--po/pl.po235
-rw-r--r--po/pt.po239
-rw-r--r--po/pt_BR.po246
-rw-r--r--po/rpm.pot233
-rw-r--r--po/ru.po241
-rw-r--r--po/sk.po241
-rw-r--r--po/sl.po240
-rw-r--r--po/sr.po238
-rw-r--r--po/sr@latin.po238
-rw-r--r--po/sv.po238
-rw-r--r--po/tr.po239
-rw-r--r--po/zh_TW.po241
26 files changed, 3810 insertions, 2932 deletions
diff --git a/po/ca.po b/po/ca.po
index 5d671d402..d0038a738 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2009-04-25 17:36+0100\n"
"Last-Translator: Agustí Grau <fedora@softcatala.org>\n"
"Language-Team: Catalan <fedora@softcatala.net>\n"
@@ -367,31 +367,31 @@ msgstr "ha fallat l'execució\n"
msgid "no packages files given for rebuild"
msgstr "no s'han donat fitxers de paquets per a reconstruir"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "no s'han donat fitxers d'especificacions per a muntar"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "no s'han donat fitxers tar per a muntar"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "no s'han donat paquets per a suprimir"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "no s'han donat paquets per a instal·lar"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "no s'han donat arguments per a consultar"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "no s'han donat arguments per a verificar"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "no s'han donat arguments"
@@ -597,7 +597,7 @@ msgstr "%s: no es pot carregar l'etiqueta incorrecta (%d).\n"
msgid "%s: public key read failed.\n"
msgstr "%s: ha fallat la clau pública.\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: no és una clau pública armada.\n"
@@ -622,7 +622,7 @@ msgstr "El fitxer ha de començar amb \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "No es permet el glob: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "El glob no ha trobat el fitxer: %s\n"
@@ -865,12 +865,12 @@ msgstr "Ha fallat l'execució de \"%s\" .\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Ha fallat la verificació del paquet \"%s\".\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "No es pot generar el nom de fitxer de sortida per al paquet %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "no es pot crear %s: %s\n"
@@ -1050,37 +1050,37 @@ msgstr "línia %d: el format de «BuildArchitecture» és incorrecte: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "linia %d: Només els subpaquets noarch estan suportats: %s\n"
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "S'ha produït un error intern: l'etiqueta %d és incorrecta\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "línia %d: es requereix la versió: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "L'especificació del paquet és incorrecta: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "El paquet ja existeix: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "línia %d: l'etiqueta és desconeguda: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} no pot estar buit\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} no pot ésser \"/\"\n"
@@ -1641,33 +1641,33 @@ msgstr "l'usuari %s no existeix - usant el root\n"
msgid "group %s does not exist - using root\n"
msgstr "el grup %s no existeix - s'està usant el root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
"no s'ha trobat el fitxer d'arxiu %s a la llista de fitxers de capçalera\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s desat com a %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s ha fallat la supressió del directori %s: el directori no és buit\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s ha fallat la supressió del directori %s: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s la supressió de %s ha fallat: %s \n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s creat com a %s\n"
@@ -1752,12 +1752,12 @@ msgstr "capçalera blob(%zd): dolenta, la lectura ha retornat %d\n"
msgid "hdr load: BAD\n"
msgstr "càrrega de la capçalera: dolenta\n"
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: El rpmReadSignature ha fallat: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: No hi ha signatura disponible\n"
@@ -1767,7 +1767,7 @@ msgstr "%s: No hi ha signatura disponible\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: El headerRead ha fallat: %s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: El Fread ha fallat: %s\n"
@@ -1941,7 +1941,7 @@ msgstr "abreviatura de --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "actualitza els paquets si ja estan instal·lats"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<fitxerPaquet>+"
@@ -2043,6 +2043,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "no executis cap scriptlet %%triggerpostun"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2050,39 +2054,39 @@ msgstr ""
"actualitza a una versió antiga del paquet (--force ho fa automàticament en "
"les actualitzacions)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "escriu els percentatges com a instal·lació de paquets"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "reubica el paquet a <dir>, si és reubicable"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "reubica els fitxers del camí <vell> al <nou>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<vell>=<nou>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "ignora els conflictes de fitxers entre paquets"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "reinstal·la si el paquet ja està present"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "no instal·lis, però digues si funcionarà correctament o no"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "actualitza paquets"
@@ -2396,7 +2400,7 @@ msgstr "número de paquet invàlid: %s\n"
msgid "record %u could not be read\n"
msgstr "el registre %lu no es pot llegir\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "no s'ha instal·lat el paquet %s\n"
@@ -2406,7 +2410,7 @@ msgstr "no s'ha instal·lat el paquet %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "etiqueta desconeguda: «%s»\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: ha fallat l'apertura: %s\n"
@@ -2440,54 +2444,59 @@ msgstr "%s: ha fallat writeLead: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: ha fallat rpmWriteSignature: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: ha fallat la importació.\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: no és una clau pública armada.\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: ha fallat la lectura de la importació (%d).\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: ha fallat headerRead\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
"%s: la regió de capçalera inmutable no s'ha pogut llegir. El paquet és "
"corrupte?\n"
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr "s'està ignorant el paquet %s amb signatura no verificable V%u\n"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "NO ÉS CORRECTE"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "D'ACORD"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (CLAUS NO TROBADES:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (CLAUS NO FIABLES:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2514,71 +2523,71 @@ msgstr "NO "
msgid "YES"
msgstr "SÍ"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
"Les dependències PreReq:, Provides:, i Obsoletes: disposen de versionatge."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
"els noms de fitxer s'han emmagatzemat com una tupla (dirName,baseName,"
"dirIndex), no com a camí"
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "les dades del paquet es poden comprimir amb el bzip2."
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr "Les dades del paquet es poden comprimir amb xz."
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr "Les dades del paquet es poden comprimir amb bzip2."
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "els fitxer de les dades del paquet tenen el prefix «./»."
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
"no s'ha proporcionat implícitament el nom-versió-alliberament del paquet."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr "les etiquetes de la capçalera sempre s'ordenen després de carregar-se."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr "l'íntèrpret de l'scriptlet pot emprar arguments de la capçalera."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
"es pot instal·lar un conjunt d'enllaços durs a fitxer sense que estiguin "
"complets."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
"els scriptlets del paquet poden accedir la base de dades rpm durant la "
"instal·lació"
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "es poden emprar scripts en lua."
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr "l'algorisme de resum de fitxer és configurable per paquet"
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr "suport per a capacitats de fitxer POSIX.1e"
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr ""
@@ -2613,47 +2622,47 @@ msgstr "Dependències fallides:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: no és un paquet rpm (o un manifest de paquet): %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "no es pot instal·lar %s\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "S'està obtenint %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "S'està ometent %s - ha fallat la transferència\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "el paquet %s no és reubicable\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "s'ha produït un error en llegir del fitxer %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "el fitxer %s necessita una nova versió d'RPM\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" especifica múltiples paquets:\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "no es pot obrir %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "S'està instal·lant %s\n"
@@ -2876,15 +2885,35 @@ msgstr "Ha fallat l'scriptlet %s, estat de sortida %d\n"
msgid "Unknown format"
msgstr "Format desconegut"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "(instalat) "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "no s'ha pogut obrir %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "No es pot llegir %s: %s.\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "No s'ha pogut canviar el nom de %s per %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2910,7 +2939,7 @@ msgstr "falta ')' a l'etiqueta del paquet: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: ha fallat la lectura de la clau pública.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
#, fuzzy
msgid "transaction"
msgstr "crea un conjunt de transaccions"
@@ -2959,71 +2988,81 @@ msgstr "emplenat sigh(%zd): dolent, s'han llegit %zd bytes\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "sigSize sigh(%zd): dolent, ha fallat fstat(2)\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr "No s'ha pogut crear una canonada per a la signatura: %m"
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "No es pot executar %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "ha fallat l'execució del gpg (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "el gpg no ha escrit la signatura\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "no es pot llegir la signatura\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
"La regió inmutable de la capçalera no s'ha pogut llegir. És possible que el "
"paquet sigui corrupte\n"
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Especificació invàlida de %%_signature al fitxer de macros\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Heu d'establir «%%_gpg_name» al vostre fitxer de macros\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr "Resum MD5:"
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "Capçalera de resum SHA1:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Capçalera "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "Verifiqueu la signatura: paràmetres dolents\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signatura: desconeguda (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s ha fallat\n"
@@ -3437,17 +3476,17 @@ msgstr "avís: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "l'assignació de memòria (%u bytes) ha retornat NULL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "%sV%d %s firma: %s, ID de la clau %s\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(cap error)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "No s'ha pogut llegir el fitxer d'especificacions des de %s\n"
@@ -3563,9 +3602,6 @@ msgstr "no verifiquis la signatura de la capçalera i les dades"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "no s'ha obtingut l'estat de %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "no s'ha pogut obrir %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "el fitxer %s és en un dispositiu desconegut\n"
@@ -3761,9 +3797,6 @@ msgstr "no verifiquis la signatura de la capçalera i les dades"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: ha fallat headerGetEntry\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "No es pot llegir %s: %s.\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "ha fallat l'expansió de %s a %s:%d «%s»\n"
diff --git a/po/cs.po b/po/cs.po
index 7f5940b9b..7fda3de44 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2001-07-24 10:02+0100\n"
"Last-Translator: Jindrich Novy <jnovy@users.sourceforge.net>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -319,31 +319,31 @@ msgstr "spuštění selhalo\n"
msgid "no packages files given for rebuild"
msgstr "ke znovusestavení nezadány žádné balíčky"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "pro sestavení nezadány žádné spec soubory"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "pro sestavení nezadány žádné tar soubory"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "nezadány žádné balíčky pro vymazání"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "nezadány žádné balíčky pro instalaci"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "k dotazu nezadány žádné parametry"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "pro kontrolu nezadány žádné balíčky"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "nezadány žádné parametry"
@@ -549,7 +549,7 @@ msgstr "%s: nemohu nahrát neznámou značku (%d).\n"
msgid "%s: public key read failed.\n"
msgstr "%s: čtení veřejného klíče selhalo.\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: není obrněný veřejný klíč.\n"
@@ -574,7 +574,7 @@ msgstr "Soubor potřebuje úvodní \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob není dovolen: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Soubor nenalezen globem: %s\n"
@@ -817,12 +817,12 @@ msgstr "Spuštění %s selhalo (%s): %s\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Chybná heslová fráze\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Nemohu vygenerovat jméno souboru pro balíček %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "nemohu vytvořit %s: %s\n"
@@ -1002,37 +1002,37 @@ msgstr "řádek %d: Špatný formát BuildArchitecture: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Interní chyba: Špatná značka: %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "řádek %d: Vyžadována verze: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Špatná specifikace balíčku: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Balíček již existuje: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "řádek %d: Neznámá značka: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "BuildRoot nemůže být prázdný\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "BuildRoot nemůže být \"/\"\n"
@@ -1591,32 +1591,32 @@ msgstr "uživatel %s neexistuje - použit uživatel root\n"
msgid "group %s does not exist - using root\n"
msgstr "skupina %s neexistuje - použita skupina root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "soubor z archivu %s nebyl nalezen v seznamu souborů v hlavičce\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s uloženo jako %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s odstranění %s selhalo: Adresář není prázdný\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir %s selhal: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s unlink %s selhal: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s vytvořen jako %s\n"
@@ -1696,12 +1696,12 @@ msgstr "hdr blob(%zd): ŠPATNÝ, čtení vrátilo %d\n"
msgid "hdr load: BAD\n"
msgstr "nahrátí hdr: ŠPATNÉ\n"
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature selhalo: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Žádný podpis k dispozici\n"
@@ -1711,7 +1711,7 @@ msgstr "%s: Žádný podpis k dispozici\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead selhal: %s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
@@ -1884,7 +1884,7 @@ msgstr "zkratka pro --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "aktualizace balíčku jestliže je již nainstalován"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<soubor_balíčku>+"
@@ -1987,6 +1987,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nespouštět žádné instalační skripty"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1994,39 +1998,39 @@ msgstr ""
"aktualizovat na starou verzi balíčku (--force to dělá při aktualizacích "
"automaticky)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "během instalace balíčku zobrazit procenta"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "přemístit soubory do <adr>, jsou-li přemístitelné"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<adresář>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "přemístit soubory ze <staré_cesty> do <nové_cesty>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<stará_cesta>=<nová_cesta>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "ignoruj souborové konflikty mezi balíčky"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "přeinstalovat, i když je již balíček přítomen"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "neinstalovat ale sdělit, zda-li by to fungovalo či nikoli"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "aktualizace balíčku"
@@ -2340,7 +2344,7 @@ msgstr "neplatné číslo balíčku: %s\n"
msgid "record %u could not be read\n"
msgstr "záznam %lu nelze přečíst\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "balíček %s není nainstalován\n"
@@ -2350,7 +2354,7 @@ msgstr "balíček %s není nainstalován\n"
msgid "unknown tag: \"%s\"\n"
msgstr "neznámá značka: \"%s\"\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otevření selhalo: %s\n"
@@ -2384,53 +2388,58 @@ msgstr "%s: writeLead selhalo: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: Fwrite selhalo: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: import selhal.\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: není obrněný veřejný klíč.\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: importní čtení selhalo(%d).\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead selhal\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
"%s: Nezměnitelná oblast hlavičky nemůže být čtena. Poškozený balíček?\n"
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr "přeskakuji balíček %s s neověřitelným V%u podpisem\n"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "NENÍ OK"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr "(CHYBĚJÍCÍ KLÍČE:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr "(NEDŮVĚRYHODNÉ KLÍČE:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2457,64 +2466,64 @@ msgstr "NE "
msgid "YES"
msgstr "ANO"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr "PreReq:, Provides:, a Obsoletes: verze pro podporu závislostí."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr "jména souborů uložená jako diName,baseName,dirIndex, ne jako cesta."
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "payload balíčku může být komprimován pomocí bzip2."
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
#, fuzzy
msgid "package payload can be compressed using xz."
msgstr "payload balíčku může být komprimován pomocí lzma."
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr "payload balíčku může být komprimován pomocí lzma."
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "soubory payloadu balíčku mají předponu \"./\"."
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr "NVR balíčku není implicitně zprostředkována."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr "značky hlavičky jsou vždy setřízeny po nahrátí."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr "interpret skriptletů může použít argumenty z hlavičky."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr "hardlinkovaný soubor může být instalován bez toho, aby byl kompletní."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr "skriptlety balíčku mohou přistupovat k rpm databázi při instalaci."
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "interní podpora pro lua skripty."
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "skriptlety balíčku mohou přistupovat k rpm databázi při instalaci."
@@ -2547,47 +2556,47 @@ msgstr "Selhalé závislosti:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: není rpm balíčkem (nebo seznamem balíčků): %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nemůže být nainstalován\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Získávám %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "přeskakuji %s - přenost selhal - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "balíček %s není přemístitelný\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "chyba při vytváření dočasného souboru %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, 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:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" specifikuje více balíčků\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nemohu otevřít %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Instaluji: %s\n"
@@ -2806,15 +2815,35 @@ msgstr "provedení %s skripletu selhalo, návratový kód: %d\n"
msgid "Unknown format"
msgstr "Neznámý"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "(instalován) "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "nemohu otevřít %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Chyba čtení %s: %s\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Nelze přejmenovat %s na %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2840,7 +2869,7 @@ msgstr "chybějící ')' v názvu balíčku: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: čtení veřejného klíče selhalo.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
#, fuzzy
msgid "transaction"
msgstr "vytvoř transakční sestavu"
@@ -2888,69 +2917,79 @@ msgstr "sigh zarovnání(%zd): ŠPATNÉ, čtení %zd bajtů\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "sigh sigSize(%zd): ŠPATNÁ, fstat(2) selhal\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr "Nemohu vytvořit rouru pro podepsání: %m"
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "Nemohu spustit %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "spuštění gpg selhalo (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "gpg selhal při zápisu podpisu\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "nemohu přečíst podpis\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr "Nezměnitelná oblast hlavičky nemůže být čtena. Poškozený balíček?\n"
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Špatná %%_signature spec v souboru maker\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Je nutné nastavit \"%%_gpg_name\" ve vašem souboru maker\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr "MD5 digest:"
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "SHA1 digest v hlavičce:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Hlavička "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "Skontrolujte podpis: ŠPATNÉ PARAMETRY\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Podpis: NEZNÁMÝ (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s selhalo\n"
@@ -3355,17 +3394,17 @@ msgstr "varování: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "alokace paměti (%u bajtů) vrátila NULL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "%sV%d %s podpis: %s, ID klíče %s\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(žádná chyba)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Nelze číst spec soubor z %s\n"
@@ -3470,9 +3509,6 @@ msgstr "neověřuj podpis hlavičky a payloadu"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "nemohu zjistit stav %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "nemohu otevřít %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "soubor %s je na neznámém zařízení\n"
@@ -3660,9 +3696,6 @@ msgstr "neověřuj podpis hlavičky a payloadu"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: hederGetEntry selhal\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "Chyba čtení %s: %s\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "rozvinutí %s selhalo na %s:%d \"%s\"\n"
diff --git a/po/da.po b/po/da.po
index 26eb72c60..e1fa9e554 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2001-04-05 23:03GMT\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -316,32 +316,32 @@ msgstr "eksekvering mislykkedes\n"
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler angivet til genopbygning"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "ingen spec-fil angivet til opbygning"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "ingen tar-arkiver angivet til opbygning"
-#: rpmqv.c:709
+#: rpmqv.c:711
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker angivet ved installation"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "ingen pakker angivet ved installation"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "ingen parametre angivet ved foresprgsel"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "ingen parametre angivet ved verifikation"
-#: rpmqv.c:784
+#: rpmqv.c:786
#, fuzzy
msgid "no arguments given"
msgstr "ingen parametre angivet ved foresprgsel"
@@ -548,7 +548,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr "%s: readLead mislykkedes\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
@@ -573,7 +573,7 @@ msgstr "Fil krver foranstillet \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "linie %d: Filnavn ikke tilladt: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Fil ikke fundet med glob: %s\n"
@@ -819,12 +819,12 @@ msgstr "Udfrelse af %s mislykkedes (%s): %s\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Adgangskode ikke godkendt\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Kunne ikke generere filnavn til oprettelse af pakke %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "kan ikke oprette %s: %s\n"
@@ -1004,37 +1004,37 @@ msgstr "linie %d: Ugyldigt 'BuildArchitecture'-format: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Intern fejl: Falsk mrke %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "linie %d: Version krves %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Ugyldig pakkeangivelse: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Pakken eksisterer allerede: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "linie %d: Ukendt mrke: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "BuildRoot kan ikke vre \"/\": %s\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "BuildRoot kan ikke vre \"/\": %s\n"
@@ -1601,32 +1601,32 @@ msgstr "bruger %s eksisterer ikke - bruger root\n"
msgid "group %s does not exist - using root\n"
msgstr "gruppe %s eksisterer ikke - bruger root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s gemt som %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "kan ikke fjerne %s - katalog ikke tomt\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "fjernelse (rmdir) af %s mislykkedes: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "bning af %s mislykkedes %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s oprettet som %s\n"
@@ -1706,12 +1706,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature mislykkedes\n"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen tilgngelig signatur\n"
@@ -1721,7 +1721,7 @@ msgstr "%s: Ingen tilgngelig signatur\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: readLead mislykkedes\n"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
@@ -1906,7 +1906,7 @@ msgstr "forkortelse for --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "opgradr pakke, hvis den allerede er installeret"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<pakkefil>+"
@@ -2013,6 +2013,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "udfr ingen installations-smskripter"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2020,41 +2024,41 @@ msgstr ""
"opgradr til en ldre version af pakken (--force gr ikke dette automatisk "
"ved opgraderinger)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "vis procenter efterhnden som pakken installeres"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "omdirigr pakken til <katalog>, hvis omdirigrbar"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<katalog>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "omdirigr filer fra <gammelsti> til <nysti>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
#, fuzzy
msgid "<old>=<new>"
msgstr "<gammelsti>=<nysti>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "geninstallr hvis pakken allerede er installeret"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "installr ikke, men fortl om det ville lykkes eller ej"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
#, fuzzy
msgid "upgrade package(s)"
msgstr "opgradr pakke"
@@ -2394,7 +2398,7 @@ msgstr "ugyldigt pakkenummer: %s\n"
msgid "record %u could not be read\n"
msgstr "post %d kunne ikke lses\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "pakken %s er ikke installeret\n"
@@ -2404,7 +2408,7 @@ msgstr "pakken %s er ikke installeret\n"
msgid "unknown tag: \"%s\"\n"
msgstr "ukendt mrke"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: bning mislykkedes: %s\n"
@@ -2439,52 +2443,57 @@ msgstr "%s: writeLead mislykkedes: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
-#: lib/rpmchecksig.c:411
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
+msgstr "%s: readLead mislykkedes\n"
+
+#: lib/rpmchecksig.c:395
#, fuzzy, c-format
-msgid "%s: import failed.\n"
+msgid "%s: key %d not an armored public key.\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:439
#, fuzzy, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "IKKE O.K."
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "O.K."
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (MANGLENDE NGLER: "
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (IKKE-BETROEDE NGLER:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2512,64 +2521,64 @@ msgstr "IKKE O.K."
msgid "YES"
msgstr ""
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
#, fuzzy
msgid "internal support for lua scripts."
msgstr "- understttes ikke for strenge\n"
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "pakken %s er allerede installeret"
@@ -2603,47 +2612,47 @@ msgstr "afhngighedskrav, der ikke kunne imdekommes:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "ingen pakker udlser %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kunne ikke installeres\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Modtager %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "overspringer %s - overfrsel mislykkedes - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "pakke %s kan ikke omrokeres\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "fejl ved lsning fra filen %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "filen %s krver en nyere version af RPM\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" angiver flere pakker\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kunne ikke bne %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
@@ -2870,15 +2879,35 @@ msgstr ""
msgid "Unknown format"
msgstr "ukendt mrke"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "ej installeret"
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "kunne ikke bne %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Kunne ikke lse %s: %s.\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Kunne ikke omdbe %s til %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2904,7 +2933,7 @@ msgstr "ugyldigt pakkenummer: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2951,70 +2980,80 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Kunne ikke udfre %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, fuzzy, c-format
msgid "gpg exec failed (%d)\n"
msgstr "eksekvering mislykkedes\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "gpg kunne ikke skrive signaturen\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "kunne ikke lse signaturen\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Du skal angive \"%%_gpg_name\" i din makrofil\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
#, fuzzy
msgid "Header SHA1 digest:"
msgstr "verificr ikke filerne i pakke"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr ""
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signaturfyld : %d\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s mislykkedes\n"
@@ -3420,17 +3459,17 @@ msgstr "advarsel: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "hukommelsesallokering (%u byte) returnerede NULL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "Ingen signatur\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(ingen fejl)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Kunne ikke lse spec-fil fra %s\n"
@@ -3505,9 +3544,6 @@ msgstr "verificr pakkesignatur"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "kunne ikke finde %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "kunne ikke bne %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "fil %s er p en ukendt enhed\n"
@@ -3689,9 +3725,6 @@ msgstr "verificr pakkesignatur"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: readLead mislykkedes\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "Kunne ikke lse %s: %s.\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "%s-udvidelse mislykkedes ved %s:%d \"%s\"\n"
diff --git a/po/de.po b/po/de.po
index 646036f9a..7f340e756 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm 4.4.2\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2009-01-11 01:27+0100\n"
"Last-Translator: Fabian Affolter <fab@fedoraproject.org>\n"
"Language-Team: German <fedora-trans-de@redhat.com>\n"
@@ -338,31 +338,31 @@ msgstr "Ausführung fehlgeschlagen\n"
msgid "no packages files given for rebuild"
msgstr "Es wurden keine Paket-Dateien für die Neuerstellung angegeben"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "Es wurde keine Spec-Datei für die Erstellung angegeben"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "Es wurde keine Tar-Datei für die Erstellung angegeben"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "Es wurden keine Argumente für die Abfrage angegeben"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "Es wurden keine Argumente angegeben"
@@ -568,7 +568,7 @@ msgstr "%s: Kann den unbekannten Tag (%d) nicht laden.\n"
msgid "%s: public key read failed.\n"
msgstr "%s: Lesen des öffentlichen Schlüssels fehlgeschlagen.\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: Ist kein gepanzerter öffentlicher Schlüssel.\n"
@@ -593,7 +593,7 @@ msgstr "Datei benötigt führenden \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "\"Glob\" hat keine Berechtigung für: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Datei von \"glob\" nicht gefunden: %s\n"
@@ -836,12 +836,12 @@ msgstr "Ausschluss von \"%s\" fehlgeschlagen.\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Paket-Prüfung \"%s\" fehlgeschlagen.\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Konnte den Dateinamen für das Paket %s nicht generieren: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "Kann Datei %s nicht erstellen: %s\n"
@@ -1022,37 +1022,37 @@ msgstr "Zeile %d: Ungültiges BuildArchitecture-Format: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "Zeile %d: Nur noarch-Unterpakete werden unterstützt: %s\n"
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Interner Fehler: Falscher Tag %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "Zeile %d: %s ist veraltet: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Ungültige Paket-Spezifikation: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Paket ist bereits vorhanden: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "Zeile %d: Unbekannter Tag: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} kann nicht leer sein\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} kann nicht \"/\" sein\n"
@@ -1614,32 +1614,32 @@ msgstr "Benutzer %s existiert nicht - benutze Root\n"
msgid "group %s does not exist - using root\n"
msgstr "Gruppe %s existiert nicht - benutze Root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "Archiv-Datei %s wurde nicht in der Header-Dateiliste gefunden\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s als %s gesichert\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s rmdir von %s fehlgeschlagen: Verzeichnis ist nicht leer\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir von %s fehlgeschlagen: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s trennen von %s fehlgeschlagen: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s erstellt als %s\n"
@@ -1719,12 +1719,12 @@ msgstr "hdr Blob(%zd): UNGÜLTIG, lesen lieferte %d zurück\n"
msgid "hdr load: BAD\n"
msgstr "hdr Load: UNGÜLTIG\n"
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature fehlgeschlagen: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Keine Signatur verfügbar\n"
@@ -1734,7 +1734,7 @@ msgstr "%s: Keine Signatur verfügbar\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead fehlgeschlagen: %s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread fehlgeschlagen: %s\n"
@@ -1908,7 +1908,7 @@ msgstr "Abkürzung für --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "Aktualisiere Paket(e), wenn bereits installiert"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<Paket-Datei>+"
@@ -2010,6 +2010,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "%%triggerpostun-Scriptlets nicht ausführen"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2017,41 +2021,41 @@ msgstr ""
"Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
"Aktualisierungen automatisch)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "Zeige Prozentangabe bei der Paket-Installation"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis "
"<Verzeichnis>"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<Verzeichnis>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "verschiebe Dateien von <alter Pfad> nach <neuer Pfad>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<alter Pfad>=<neuer Pfad>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "Ignoriere Datei-Konflikte zwischen Paketen"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "Installiere erneut, wenn das Paket bereits vorhanden ist"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "Paket(e) aktualisieren"
@@ -2364,7 +2368,7 @@ msgstr "Ungültige Paket-Nummer: %s\n"
msgid "record %u could not be read\n"
msgstr "Eintrag %lu konnte nicht gelesen werden\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "Das Paket %s ist nicht installiert\n"
@@ -2374,7 +2378,7 @@ msgstr "Das Paket %s ist nicht installiert\n"
msgid "unknown tag: \"%s\"\n"
msgstr "Unbekannter Tag: \"%s\"\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: Öffnen fehlgeschlagen: %s\n"
@@ -2408,53 +2412,58 @@ msgstr "%s: writeLead fehlgeschlagen: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature fehlgeschlagen: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: Importieren fehlgeschlagen\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: Ist kein gepanzerter öffentlicher Schlüssel.\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: Importieren fehlgeschlagen (%d).\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead fehlgeschlagen\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
"%s: Immuner Header-Bereich konnte nicht gelesen werden. Korruptes Paket?\n"
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr "überspringe Paket %s nicht überprüfbaren V%u Signatur\n"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "NICHT OK"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (FEHLENDE SCHLÜSSEL:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (UNBESTÄTIGTE SCHLÜSSEL:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2481,70 +2490,70 @@ msgstr "NEIN "
msgid "YES"
msgstr "JA"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr "PreReq:, Provides:, und Obsoletes: unterstützen Versionen."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
"Dateiname(n) als (dirName,baseName,dirIndex)-Tupel gespeichert, nicht als "
"Pfad."
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "Paket-Nutzdaten können mit bzip2 komprimiert werden."
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr "Paket-Nutzdaten können mit xz komprimiert werden."
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr "Paket-Nutzdaten können mit lzma komprimiert werden."
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "Dateien der Paket-Nutzdaten haben \"./\" als Präfix"
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr "Paket Name-Version-Release wird nicht unbedingt bereitgestellt."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr "Header-Tags werden immer nach dem Laden sortiert."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr "Der Scriptlet-Interpreter kann Argumente aus dem Header benutzen."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
"Eine harte Verlinkung kann auch ohne eine komplette Installation angelegt "
"werden."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
"Paket-Scriptlets können während der Installation auf die RPM-Datenbank "
"zugreifen."
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "Interne Unterstützung für LUA-Scripte"
# Gefällt mir nicht...bessere Vorschläge? Fabian
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr "Datei-Prüfsummen-Algorithmus ist pro Paket konfigurierbar"
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr "Unterstützung für POSIX.1e-Dateifähigkeiten"
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr ""
@@ -2579,47 +2588,47 @@ msgstr "Fehlgeschlagende Abhängigkeiten:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: Kein RPM-Paket (oder Paket-Liste): %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kann nicht installiert werden\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Empfange %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "überspringe %s - Übertragung fehlgeschlagen\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "Paket %s ist nicht verschiebbar\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "Fehler beim Lesen von Datei %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "Die Datei %s benötigt eine neuere RPM-Version\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" bezeichnet mehrere Pakete:\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "Kann %s nicht öffnen: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Installiere %s\n"
@@ -2842,15 +2851,35 @@ msgstr "%s Scriptlet fehlgeschlagen, Beenden-Status %d\n"
msgid "Unknown format"
msgstr "Unbekanntes Format"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "(installiert) "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "Öffnen von %s fehlgeschlagen: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Fehlgeschlagenes Lesen von %s: %s.\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Konnte %s nicht in %s umbenennen: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2876,7 +2905,7 @@ msgstr "Fehlende ')' im Paket-Bezeichung: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: Lesen des öffentlichen Schlüssels fehlgeschlagen.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
#, fuzzy
msgid "transaction"
msgstr "Erstelle Transaktionsset"
@@ -2924,69 +2953,79 @@ msgstr "sigh-Pad(%zd): UNGÜLTIG, lese %zd Byte\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "sigh sigSize(%zd): UNGÜLTIG, fstat(2) fehlgeschlagen\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr "Konnte kein Pipe zum Signieren erzeugen: %m"
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "Konnte %s nicht ausführen: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "GPG fehlgeschlagen (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "GPG konnte die Signatur nicht schreiben\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "Konnte die Signatur nicht lesen\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr "Immuner Header-Bereich konnte nicht gelesen werden. Korruptes Paket?\n"
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Ungültige %%_signature-Spezifikation in der Makro-Datei\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "\"%%_gpg_name\" muss in der Makro-Datei gesetzt sein\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr "MD5-Kurzfassung: "
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "SHA1-Kurzfassung des Headers: "
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Header "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "Überprüfe Signatur: UNGÜLTIGE PARAMETER\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signatur: UNBEKANNT (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s fehlgeschlagen\n"
@@ -3392,17 +3431,17 @@ msgstr "Warnung: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "Speicherbelegung (%u Byte) lieferte NULL zurück.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "V%d %s/%s %s, Schlüssel-ID %s"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(keine)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Konnte Zweig-Handler nicht registrieren: %m\n"
@@ -3518,9 +3557,6 @@ msgstr "Keine Überprüfung der Header- und Nutzdaten-Signatur"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "Aufruf von stat für %s nicht möglich: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "Öffnen von %s fehlgeschlagen: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "Datei %s ist auf einem unbekannten Gerät\n"
@@ -3735,9 +3771,6 @@ msgstr "Keine Überprüfung der Header- und Nutzdaten-Signatur"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: headerGetEntry fehlgeschlagen\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "Fehlgeschlagenes Lesen von %s: %s.\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "Erweiterung von %s bei %s:%d \"%s\" fehlgeschlagen\n"
diff --git a/po/es.po b/po/es.po
index cb4f3ef30..7fca2df5c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm.rpm-4-7-x.rpm\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2010-06-14 12:31-0300\n"
"Last-Translator: Héctor Daniel Cabrera <logan@fedoraproject.org>\n"
"Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
@@ -106,26 +106,24 @@ msgstr "Opciones de la base de datos:"
#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
-msgstr "Opciones de construcción con [ <archivo spec> | <tarball> | <paquete fuente> ]:"
+msgstr ""
+"Opciones de construcción con [ <archivo spec> | <tarball> | <paquete "
+"fuente> ]:"
#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Opciones de Instalación/Actualización/Remoción:"
-#: rpmqv.c:118
-#: tools/rpmdeps.c:32
-#: tools/rpmgraph.c:248
+#: rpmqv.c:118 tools/rpmdeps.c:32 tools/rpmgraph.c:248
msgid "Common options for all rpm modes and executables:"
msgstr "Opciones comunes para todos los modos rpm y ejecutables:"
-#: rpmqv.c:134
-#: lib/poptI.c:31
+#: rpmqv.c:134 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:140
-#: lib/poptALL.c:63
+#: rpmqv.c:140 lib/poptALL.c:63
#, c-format
msgid "RPM version %s\n"
msgstr "versión RPM %s\n"
@@ -137,18 +135,18 @@ msgstr "Derechos Reservados (C) 1998-2002 - Red Hat, Inc.\n"
#: rpmqv.c:146
#, c-format
-msgid "This program may be freely redistributed under the terms of the GNU GPL\n"
-msgstr "Este programa puede ser redistribuido libremente bajo los términos de la licencia GNU GPL\n"
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
+msgstr ""
+"Este programa puede ser redistribuido libremente bajo los términos de la "
+"licencia GNU GPL\n"
#: rpmqv.c:278
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Error interno en el procesamiento del argumento (%d) :-(\n"
-#: rpmqv.c:316
-#: rpmqv.c:322
-#: rpmqv.c:328
-#: rpmqv.c:365
+#: rpmqv.c:316 rpmqv.c:322 rpmqv.c:328 rpmqv.c:365
msgid "only one major mode may be specified"
msgstr "solo puede especificarse un modo principal"
@@ -170,19 +168,25 @@ msgstr "fuente de consulta inesperado"
#: rpmqv.c:397
msgid "only installation, upgrading, rmsource and rmspec may be forced"
-msgstr "solo las opciones de instalación, actualización, rmsource y rmspec pueden ser forzadas"
+msgstr ""
+"solo las opciones de instalación, actualización, rmsource y rmspec pueden "
+"ser forzadas"
#: rpmqv.c:399
msgid "files may only be relocated during package installation"
-msgstr "los archivos solo pueden ser reubicados durante la instalación del paquete"
+msgstr ""
+"los archivos solo pueden ser reubicados durante la instalación del paquete"
#: rpmqv.c:402
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr "no se puede utilizar --prefix con --relocate o --excludepath"
#: rpmqv.c:405
-msgid "--relocate and --excludepath may only be used when installing new packages"
-msgstr "--relocate y --excludepath solo pueden ser utilizados cuando se instalan nuevos paquetes"
+msgid ""
+"--relocate and --excludepath may only be used when installing new packages"
+msgstr ""
+"--relocate y --excludepath solo pueden ser utilizados cuando se instalan "
+"nuevos paquetes"
#: rpmqv.c:408
msgid "--prefix may only be used when installing new packages"
@@ -194,23 +198,28 @@ msgstr "los argumentos de --prefix deber iniciar con una /"
#: rpmqv.c:414
msgid "--hash (-h) may only be specified during package installation"
-msgstr "--hash (-h) solo puede ser especificado durante la instalación del paquete"
+msgstr ""
+"--hash (-h) solo puede ser especificado durante la instalación del paquete"
#: rpmqv.c:418
msgid "--percent may only be specified during package installation"
-msgstr "--percent solo puede ser especificado durante la instalación del paquete"
+msgstr ""
+"--percent solo puede ser especificado durante la instalación del paquete"
#: rpmqv.c:422
msgid "--replacepkgs may only be specified during package installation"
-msgstr "--replacepkgs solo puede ser especificado durante la instalación del paquete"
+msgstr ""
+"--replacepkgs solo puede ser especificado durante la instalación del paquete"
#: rpmqv.c:426
msgid "--excludedocs may only be specified during package installation"
-msgstr "--excludedocs solo puede ser especificado durante la instalación del paquete"
+msgstr ""
+"--excludedocs solo puede ser especificado durante la instalación del paquete"
#: rpmqv.c:430
msgid "--includedocs may only be specified during package installation"
-msgstr "--includedocs solo puede ser especificado durante la instalación del paquete"
+msgstr ""
+"--includedocs solo puede ser especificado durante la instalación del paquete"
#: rpmqv.c:434
msgid "only one of --excludedocs and --includedocs may be specified"
@@ -218,47 +227,75 @@ msgstr "solo se puede especificar una opción: --excludedocs o --includedocs"
#: rpmqv.c:438
msgid "--ignorearch may only be specified during package installation"
-msgstr "--ignorearch solo puede ser especificado durante la instalación del paquete"
+msgstr ""
+"--ignorearch solo puede ser especificado durante la instalación del paquete"
#: rpmqv.c:442
msgid "--ignoreos may only be specified during package installation"
-msgstr "--ignoreos solo puede ser especificado durante la instalación del paquete"
+msgstr ""
+"--ignoreos solo puede ser especificado durante la instalación del paquete"
#: rpmqv.c:447
msgid "--ignoresize may only be specified during package installation"
-msgstr "--ignoresize solo puede ser especificado durante la instalación del paquete"
+msgstr ""
+"--ignoresize solo puede ser especificado durante la instalación del paquete"
#: rpmqv.c:451
msgid "--allmatches may only be specified during package erasure"
-msgstr "--allmatches solo puede ser especificado durante la eliminación del paquete"
+msgstr ""
+"--allmatches solo puede ser especificado durante la eliminación del paquete"
#: rpmqv.c:455
msgid "--allfiles may only be specified during package installation"
-msgstr "--allfiles solo puede ser especificado durante la instalación del paquete"
+msgstr ""
+"--allfiles solo puede ser especificado durante la instalación del paquete"
#: rpmqv.c:460
msgid "--justdb may only be specified during package installation and erasure"
-msgstr "--justdb solo puede ser especificado durante la instalación y eliminación del paquete"
+msgstr ""
+"--justdb solo puede ser especificado durante la instalación y eliminación "
+"del paquete"
#: rpmqv.c:465
-msgid "script disabling options may only be specified during package installation and erasure"
-msgstr "las opciones para desactivar scripts sólo pueden ser especificadas durante la instalación y eliminación del paquete"
+msgid ""
+"script disabling options may only be specified during package installation "
+"and erasure"
+msgstr ""
+"las opciones para desactivar scripts sólo pueden ser especificadas durante "
+"la instalación y eliminación del paquete"
#: rpmqv.c:470
-msgid "trigger disabling options may only be specified during package installation and erasure"
-msgstr "las opciones de desactivación de detonante sólo pueden ser especificadas durante la instalación y eliminación del paquete"
+msgid ""
+"trigger disabling options may only be specified during package installation "
+"and erasure"
+msgstr ""
+"las opciones de desactivación de detonante sólo pueden ser especificadas "
+"durante la instalación y eliminación del paquete"
#: rpmqv.c:474
-msgid "--nodeps may only be specified during package building, rebuilding, recompilation, installation,erasure, and verification"
-msgstr "--nodeps sólo puede ser especificado durante la construcción, re-construcción, recompilación, instalación, eliminación y verificación del paquete"
+msgid ""
+"--nodeps may only be specified during package building, rebuilding, "
+"recompilation, installation,erasure, and verification"
+msgstr ""
+"--nodeps sólo puede ser especificado durante la construcción, re-"
+"construcción, recompilación, instalación, eliminación y verificación del "
+"paquete"
#: rpmqv.c:479
-msgid "--test may only be specified during package installation, erasure, and building"
-msgstr "--test sólo puede ser especificado durante instalación, eliminación, y construcción del paquete"
+msgid ""
+"--test may only be specified during package installation, erasure, and "
+"building"
+msgstr ""
+"--test sólo puede ser especificado durante instalación, eliminación, y "
+"construcción del paquete"
#: rpmqv.c:484
-msgid "--root (-r) may only be specified during installation, erasure, querying, and database rebuilds"
-msgstr "--root (-r) sólo puede ser especificado durante instalación, eliminación, consulta y re-construcción de la base de datos"
+msgid ""
+"--root (-r) may only be specified during installation, erasure, querying, "
+"and database rebuilds"
+msgstr ""
+"--root (-r) sólo puede ser especificado durante instalación, eliminación, "
+"consulta y re-construcción de la base de datos"
#: rpmqv.c:495
msgid "arguments to --root (-r) must begin with a /"
@@ -311,36 +348,35 @@ msgstr "falló exec\n"
msgid "no packages files given for rebuild"
msgstr "ningún paquete proporcionado para la reconstrucción"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "no ha sido indicado ningún archivo spec para la construcción"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "no ha sido indicado ningún archivo tar para la construcción"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "no ha sido indicado ningún paquete para ser eliminado"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "no ha sido indicado ningún paquete para la instalación"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "no ha sido indicado ningún argumento para la consulta"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "no ha sido indicado ningún argumento para la verificación"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "no ha sido indicado ningún argumento"
-#: build/build.c:134
-#: build/pack.c:446
+#: build/build.c:134 build/pack.c:446
msgid "Unable to open temp file.\n"
msgstr "No es posible abrir archivo temporal.\n"
@@ -397,9 +433,7 @@ msgstr "- solo en números\n"
msgid "! only on numbers\n"
msgstr "! solo en números\n"
-#: build/expression.c:423
-#: build/expression.c:471
-#: build/expression.c:529
+#: build/expression.c:423 build/expression.c:471 build/expression.c:529
#: build/expression.c:621
msgid "types must match\n"
msgstr "los tipos deben coincidir\n"
@@ -416,8 +450,7 @@ msgstr "- no está soportado en cadenas\n"
msgid "&& and || not suported for strings\n"
msgstr "&& y || no están soportados en cadenas\n"
-#: build/expression.c:667
-#: build/expression.c:714
+#: build/expression.c:667 build/expression.c:714
msgid "syntax error in expression\n"
msgstr "error de sintaxis en la expresión\n"
@@ -426,23 +459,17 @@ msgstr "error de sintaxis en la expresión\n"
msgid "TIMECHECK failure: %s\n"
msgstr "Falló TIMECHECK: %s\n"
-#: build/files.c:304
-#: build/files.c:497
-#: build/files.c:714
+#: build/files.c:304 build/files.c:497 build/files.c:714
#, c-format
msgid "Missing '(' in %s %s\n"
msgstr "'(' ausente en %s %s\n"
-#: build/files.c:314
-#: build/files.c:650
-#: build/files.c:724
-#: build/files.c:816
+#: build/files.c:314 build/files.c:650 build/files.c:724 build/files.c:816
#, c-format
msgid "Missing ')' in %s(%s\n"
msgstr "')' ausente en %s(%s\n"
-#: build/files.c:350
-#: build/files.c:673
+#: build/files.c:350 build/files.c:673
#, c-format
msgid "Invalid %s token: %s\n"
msgstr "Elemento %s no válido: %s\n"
@@ -529,7 +556,8 @@ msgstr "El enlace simbólico apunta a BuildRoot: %s -> %s\n"
#: build/files.c:1411
#, c-format
msgid "Explicit file attributes required in spec for: %s\n"
-msgstr "Atributos de archivo explícito solicitados en las especificaciones para: %s\n"
+msgstr ""
+"Atributos de archivo explícito solicitados en las especificaciones para: %s\n"
#: build/files.c:1419
#, c-format
@@ -552,7 +580,6 @@ msgid "%s: public key read failed.\n"
msgstr "%s: falló la lectura de la clave publica.\n"
#: build/files.c:1626
-#: lib/rpmchecksig.c:418
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: no es una clave pública con armadura.\n"
@@ -577,8 +604,7 @@ msgstr "El archivo necesita comenzar con \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob no permitido: %s\n"
-#: build/files.c:1715
-#: lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Archivo no encontrado por glob: %s\n"
@@ -598,8 +624,7 @@ msgstr "línea: %s\n"
msgid "Bad file: %s: %s\n"
msgstr "Archivo erróneo: %s: %s\n"
-#: build/files.c:2161
-#: build/parsePrep.c:31
+#: build/files.c:2161 build/parsePrep.c:31
#, c-format
msgid "Bad owner/group: %s\n"
msgstr "propietario/grupo erróneo: %s\n"
@@ -625,7 +650,8 @@ msgstr "Procesando archivos: %s\n"
#: build/files.c:2255
msgid "Arch dependent binaries in noarch package\n"
-msgstr "Binarios dependientes de la arquitectura en paquetes sin arquitectura\n"
+msgstr ""
+"Binarios dependientes de la arquitectura en paquetes sin arquitectura\n"
#: build/names.c:49
msgid "getUname: too many uid's\n"
@@ -822,12 +848,13 @@ msgstr "Falló la ejecución de \"%s\":\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Falló la verificación \"%s\" del paquete\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
-msgstr "No se pudo generar el nombre de archivo de salida para el paquete %s: %s\n"
+msgstr ""
+"No se pudo generar el nombre de archivo de salida para el paquete %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "no es posible crear %s: %s\n"
@@ -857,8 +884,7 @@ msgstr "fecha errónea en %%changelog: %s\n"
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog no está en orden cronológico descendente\n"
-#: build/parseChangelog.c:167
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:167 build/parseChangelog.c:178
#, c-format
msgid "missing name in %%changelog\n"
msgstr "nombre ausente en %%changelog\n"
@@ -873,23 +899,17 @@ msgstr "ninguna descripción en %%changelog\n"
msgid "line %d: Error parsing %%description: %s\n"
msgstr "línea %d: Error al analizar %%description: %s\n"
-#: build/parseDescription.c:48
-#: build/parseFiles.c:43
-#: build/parseScript.c:231
+#: build/parseDescription.c:48 build/parseFiles.c:43 build/parseScript.c:231
#, c-format
msgid "line %d: Bad option %s: %s\n"
msgstr "línea %d: Opción errónea %s: %s\n"
-#: build/parseDescription.c:59
-#: build/parseFiles.c:54
-#: build/parseScript.c:242
+#: build/parseDescription.c:59 build/parseFiles.c:54 build/parseScript.c:242
#, c-format
msgid "line %d: Too many names: %s\n"
msgstr "línea %d: Demasiados nombres: %s\n"
-#: build/parseDescription.c:67
-#: build/parseFiles.c:62
-#: build/parseScript.c:250
+#: build/parseDescription.c:67 build/parseFiles.c:62 build/parseScript.c:250
#, c-format
msgid "line %d: Package does not exist: %s\n"
msgstr "línea %d: El paquete no existe: %s\n"
@@ -1014,37 +1034,37 @@ msgstr "línea %d: Formato BuildArchitecture erróneo: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "linea %d: Solo existe soporte para subpaquetes sin arquitectura: %s\n"
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Error interno: Etiqueta errónea %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "línea %d: %s se encuentra obsoleta: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Especificación de paquete errónea: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "El paquete ya existe: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "línea %d: Etiqueta desconocida: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} no puede ser vacío\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{BuildRoot} no puede ser \"/\"\n"
@@ -1110,8 +1130,11 @@ msgstr "línea %d: segundo %%prep\n"
#: build/parseReqs.c:108
#, c-format
-msgid "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
-msgstr "línea %d: Elementos de dependencias deben iniciar con un valor alfanumérico, '_' o '/': %s\n"
+msgid ""
+"line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
+msgstr ""
+"línea %d: Elementos de dependencias deben iniciar con un valor alfanumérico, "
+"'_' o '/': %s\n"
#: build/parseReqs.c:135
#, c-format
@@ -1133,8 +1156,7 @@ msgstr "línea %d: dependencia no válida: %s\n"
msgid "line %d: triggers must have --: %s\n"
msgstr "línea %d: los detonantes deben tener --: %s\n"
-#: build/parseScript.c:201
-#: build/parseScript.c:264
+#: build/parseScript.c:201 build/parseScript.c:264
#, c-format
msgid "line %d: Error parsing %s: %s\n"
msgstr "línea %d: Error al analizar %s: %s\n"
@@ -1189,8 +1211,7 @@ msgstr "%s:%d: Tiene un %%else sin %%if\n"
msgid "%s:%d: Got a %%endif with no %%if\n"
msgstr "%s:%d: Tiene un %%endif sin %%if\n"
-#: build/parseSpec.c:356
-#: build/parseSpec.c:365
+#: build/parseSpec.c:356 build/parseSpec.c:365
#, c-format
msgid "malformed %%include statement\n"
msgstr "declaración %%include malformada\n"
@@ -1212,15 +1233,12 @@ msgstr "buildroot ya especificado, ignorando %s\n"
#: build/poptBT.c:133
#, c-format
msgid "build through %prep (unpack sources and apply patches) from <specfile>"
-msgstr "construir a través de %prep (desempaquetar fuentes y aplicar parches) desde <specfile>"
-
-#: build/poptBT.c:134
-#: build/poptBT.c:137
-#: build/poptBT.c:140
-#: build/poptBT.c:143
-#: build/poptBT.c:146
-#: build/poptBT.c:149
-#: build/poptBT.c:152
+msgstr ""
+"construir a través de %prep (desempaquetar fuentes y aplicar parches) desde "
+"<specfile>"
+
+#: build/poptBT.c:134 build/poptBT.c:137 build/poptBT.c:140 build/poptBT.c:143
+#: build/poptBT.c:146 build/poptBT.c:149 build/poptBT.c:152
msgid "<specfile>"
msgstr "<specfile>"
@@ -1230,7 +1248,9 @@ msgstr "construir a través de %build (%prep, luego compilar) desde <specfile>"
#: build/poptBT.c:139
msgid "build through %install (%prep, %build, then install) from <specfile>"
-msgstr "construir a través de %install (%prep, %build, luego instalar) desde <specfile>"
+msgstr ""
+"construir a través de %install (%prep, %build, luego instalar) desde "
+"<specfile>"
#: build/poptBT.c:142
#, c-format
@@ -1252,15 +1272,12 @@ msgstr "construir paquete fuente únicamente desde <specfile>"
#: build/poptBT.c:155
#, c-format
msgid "build through %prep (unpack sources and apply patches) from <tarball>"
-msgstr "construir a través de %prep (desempaquetar fuentes y aplicar parches) desde <tarball>"
-
-#: build/poptBT.c:156
-#: build/poptBT.c:159
-#: build/poptBT.c:162
-#: build/poptBT.c:165
-#: build/poptBT.c:168
-#: build/poptBT.c:171
-#: build/poptBT.c:174
+msgstr ""
+"construir a través de %prep (desempaquetar fuentes y aplicar parches) desde "
+"<tarball>"
+
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:168 build/poptBT.c:171 build/poptBT.c:174
msgid "<tarball>"
msgstr "<tarball>"
@@ -1270,7 +1287,9 @@ msgstr "construir a través de %build (%prep, luego compilar) desde <tarball>"
#: build/poptBT.c:161
msgid "build through %install (%prep, %build, then install) from <tarball>"
-msgstr "construir a través de %install (%prep, %build, luego instalar) desde <tarball>"
+msgstr ""
+"construir a través de %install (%prep, %build, luego instalar) desde "
+"<tarball>"
#: build/poptBT.c:164
#, c-format
@@ -1293,14 +1312,16 @@ msgstr "construir paquete fuente desde <tarball> "
msgid "build binary package from <source package>"
msgstr "construir paquete binario desde <source package>"
-#: build/poptBT.c:178
-#: build/poptBT.c:181
+#: build/poptBT.c:178 build/poptBT.c:181
msgid "<source package>"
msgstr "<paquete fuente>"
#: build/poptBT.c:180
-msgid "build through %install (%prep, %build, then install) from <source package>"
-msgstr "construir a través de %install (%prep, %build, luego instalar) desde <paquete fuente>"
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+"construir a través de %install (%prep, %build, luego instalar) desde "
+"<paquete fuente>"
#: build/poptBT.c:184
msgid "override build root"
@@ -1332,28 +1353,22 @@ msgstr "no verificar dependencias de la construcción"
#: build/poptBT.c:198
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
-msgstr "generar encabezados de paquetes compatibles con el empaquetamiento rpm[23] (legado)"
+msgstr ""
+"generar encabezados de paquetes compatibles con el empaquetamiento rpm[23] "
+"(legado)"
-#: build/poptBT.c:202
-#: lib/poptALL.c:178
-#: lib/poptI.c:236
-#: lib/poptQV.c:293
+#: build/poptBT.c:202 lib/poptALL.c:178 lib/poptI.c:236 lib/poptQV.c:293
#: lib/poptQV.c:331
msgid "don't verify package digest(s)"
msgstr "no verificar resumen del paquete(s)"
-#: build/poptBT.c:204
-#: lib/poptALL.c:180
-#: lib/poptI.c:238
-#: lib/poptQV.c:295
+#: build/poptBT.c:204 lib/poptALL.c:180 lib/poptI.c:238 lib/poptQV.c:295
#: lib/poptQV.c:334
msgid "don't verify database header(s) when retrieved"
-msgstr "no verificar la base de datos de lo(s) encabezado(s) cuando sean recuperadas"
+msgstr ""
+"no verificar la base de datos de lo(s) encabezado(s) cuando sean recuperadas"
-#: build/poptBT.c:206
-#: lib/poptALL.c:182
-#: lib/poptI.c:240
-#: lib/poptQV.c:297
+#: build/poptBT.c:206 lib/poptALL.c:182 lib/poptI.c:240 lib/poptQV.c:297
#: lib/poptQV.c:336
msgid "don't verify package signature(s)"
msgstr "no verificar la firma(s) del paquete"
@@ -1402,8 +1417,7 @@ msgstr "No se pudo cambiar al directorio %s: %s\n"
msgid "Couldn't exec %s: %s\n"
msgstr "No se pudo ejecutar la llamada exec %s: %s\n"
-#: build/rpmfc.c:191
-#: lib/rpmscript.c:235
+#: build/rpmfc.c:191 lib/rpmscript.c:235
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "No se pudo ejecutar la llamada al sistema fork para %s: %s\n"
@@ -1447,8 +1461,7 @@ msgstr "Falló la identificación del archivo \"%s\": modo %06o %s\n"
msgid "Finding %s: %s\n"
msgstr "Buscando %s: %s\n"
-#: build/rpmfc.c:1104
-#: build/rpmfc.c:1113
+#: build/rpmfc.c:1104 build/rpmfc.c:1113
#, c-format
msgid "Failed to find %s:\n"
msgstr "Falló la búsqueda de %s:\n"
@@ -1529,14 +1542,8 @@ msgstr "el paquete %s ya fue añadido, omitiendo %s\n"
msgid "package %s was already added, replacing with %s\n"
msgstr "el paquete %s ya fue añadido, reemplazando con %s\n"
-#: lib/formats.c:77
-#: lib/formats.c:118
-#: lib/formats.c:208
-#: lib/formats.c:235
-#: lib/formats.c:284
-#: lib/formats.c:306
-#: lib/formats.c:547
-#: lib/formats.c:586
+#: lib/formats.c:77 lib/formats.c:118 lib/formats.c:208 lib/formats.c:235
+#: lib/formats.c:284 lib/formats.c:306 lib/formats.c:547 lib/formats.c:586
#: lib/formats.c:626
msgid "(not a number)"
msgstr "(no es un número)"
@@ -1558,8 +1565,7 @@ msgstr "(no base64)"
msgid "(invalid type)"
msgstr "(tipo no válido)"
-#: lib/formats.c:380
-#: lib/formats.c:466
+#: lib/formats.c:380 lib/formats.c:466
msgid "(not a blob)"
msgstr "(no es un blob)"
@@ -1613,33 +1619,34 @@ msgstr "usuario %s no existe - utilizando root\n"
msgid "group %s does not exist - using root\n"
msgstr "grupo %s no existe - utilizando root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
-msgstr "el fichero de archivo %s no se encontró en la lista del encabezado del archivo\n"
+msgstr ""
+"el fichero de archivo %s no se encontró en la lista del encabezado del "
+"archivo\n"
-#: lib/fsm.c:1617
-#: lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s guardado como %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s rmdir de %s falló: el directorio no está vacío\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir de %s falló: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s desenlace de %s fallido: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s creado como %s\n"
@@ -1659,28 +1666,25 @@ msgstr "omitiendo %s con firma V%u no verificable\n"
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
msgstr "tamaño de blob(%d): INVALIDO, 8 + 16 * il(%d) + dl(%d)\n"
-#: lib/package.c:237
-#: lib/package.c:292
-#: lib/package.c:360
-#: lib/signature.c:174
+#: lib/package.c:237 lib/package.c:292 lib/package.c:360 lib/signature.c:174
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
-msgstr "tag[%d]: INVALIDADO, etiqueta %d, ipo %d desplazamiento %d contador %d\n"
+msgstr ""
+"tag[%d]: INVALIDADO, etiqueta %d, ipo %d desplazamiento %d contador %d\n"
-#: lib/package.c:255
-#: lib/signature.c:188
+#: lib/package.c:255 lib/signature.c:188
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
-msgstr "region offset: INVALIDO, etiqueta %d tipo %d desplazamiento %d contador %d\n"
+msgstr ""
+"region offset: INVALIDO, etiqueta %d tipo %d desplazamiento %d contador %d\n"
-#: lib/package.c:273
-#: lib/signature.c:212
+#: lib/package.c:273 lib/signature.c:212
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
-msgstr "region trailer: INVALIDO, etiqueta %d tipo %d desplazamiento %d contador %d\n"
+msgstr ""
+"region trailer: INVALIDO, etiqueta %d tipo %d desplazamiento %d contador %d\n"
-#: lib/package.c:283
-#: lib/signature.c:222
+#: lib/package.c:283 lib/signature.c:222
#, c-format
msgid "region size: BAD, ril(%d) > il(%d)\n"
msgstr "region size: INVALIDO, rill(%d) > il(%d)\n"
@@ -1725,16 +1729,12 @@ msgstr "hdr blob(%zd): INVALIDO, la lectura regreso %d\n"
msgid "hdr load: BAD\n"
msgstr "hdr load: INVALIDO\n"
-#: lib/package.c:582
-#: lib/rpmchecksig.c:183
-#: lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature falló: %s"
-#: lib/package.c:589
-#: lib/rpmchecksig.c:190
-#: lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: ninguna firma disponible\n"
@@ -1744,9 +1744,7 @@ msgstr "%s: ninguna firma disponible\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead falló: %s"
-#: lib/package.c:686
-#: lib/rpmchecksig.c:91
-#: lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread falló: %s\n"
@@ -1765,8 +1763,7 @@ msgstr "Carga útil (%s) no soportada en el paquete %s\n"
msgid "predefine MACRO with value EXPR"
msgstr "predefine MACRO con valor EXPR"
-#: lib/poptALL.c:166
-#: lib/poptALL.c:169
+#: lib/poptALL.c:166 lib/poptALL.c:169
msgid "'MACRO EXPR'"
msgstr "'MACRO EXPR'"
@@ -1782,15 +1779,11 @@ msgstr "imprimir expansión de macro de EXPR"
msgid "'EXPR'"
msgstr "'EXPR'"
-#: lib/poptALL.c:174
-#: lib/poptALL.c:189
-#: lib/poptALL.c:193
+#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
msgid "read <FILE:...> instead of default file(s)"
msgstr "leer <FILE:...> en vez del archivo(s) predeterminado"
-#: lib/poptALL.c:175
-#: lib/poptALL.c:190
-#: lib/poptALL.c:194
+#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
msgid "<FILE:...>"
msgstr "<FILE:...>"
@@ -1865,14 +1858,19 @@ msgstr "agregar los paquetes sugeridos a la transacción"
#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
-msgstr "instalar todos los archivos, incluso los de configuración, que de otra manera serían salteados."
+msgstr ""
+"instalar todos los archivos, incluso los de configuración, que de otra "
+"manera serían salteados."
#: lib/poptI.c:135
-msgid "remove all packages which match <package> (normally an error is generated if <package> specified multiple packages)"
-msgstr "remueve todos los paquetes que coincidan con <paquetes> (normalmente un error es generado si <paquete> especifica multiples paquetes) "
+msgid ""
+"remove all packages which match <package> (normally an error is generated if "
+"<package> specified multiple packages)"
+msgstr ""
+"remueve todos los paquetes que coincidan con <paquetes> (normalmente un "
+"error es generado si <paquete> especifica multiples paquetes) "
-#: lib/poptI.c:141
-#: lib/poptI.c:220
+#: lib/poptI.c:141 lib/poptI.c:220
msgid "do not execute package scriptlet(s)"
msgstr "no ejecutar scriptlet(s) del paquete"
@@ -1892,13 +1890,11 @@ msgstr "borrar (desinstalar) paquete"
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:156
-#: lib/poptI.c:196
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "no instalar los archivos de configuración"
-#: lib/poptI.c:159
-#: lib/poptI.c:201
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "no instalar documentación"
@@ -1922,9 +1918,7 @@ msgstr "abreviatura para --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "actualizar paquete(s) si ya están instalados"
-#: lib/poptI.c:173
-#: lib/poptI.c:189
-#: lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -1960,9 +1954,7 @@ msgstr "actualizar la base de datos, mas no modificar el sistema de archivos"
msgid "do not verify package dependencies"
msgstr "no verificar las dependencias del paquete"
-#: lib/poptI.c:204
-#: lib/poptQV.c:251
-#: lib/poptQV.c:253
+#: lib/poptI.c:204 lib/poptQV.c:251 lib/poptQV.c:253
msgid "don't verify digest of files"
msgstr "no verificar el digest de los archivos"
@@ -2027,42 +2019,50 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "no ejecutar ningún %%triggerpostun scriptlet(s)"
#: lib/poptI.c:259
-msgid "upgrade to an old version of the package (--force on upgrades does this automatically)"
-msgstr "actualiza a una versión antigua del paquete (--force en actualizaciones hace esto automaticamente)"
+msgid "do not perform any collection actions"
+msgstr ""
#: lib/poptI.c:263
+msgid ""
+"upgrade to an old version of the package (--force on upgrades does this "
+"automatically)"
+msgstr ""
+"actualiza a una versión antigua del paquete (--force en actualizaciones hace "
+"esto automaticamente)"
+
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "imprimir porcentaje mientras se instala el paquete"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "realojar el paquete a <dir> si éste es realojable"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "realojar archivos de la ruta <old> a <new>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "ignorar conflictos entre paquetes referentes a archivos "
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "reinstalar si el paquete ya está presente"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "no instalar, pero señalar si se puede o no"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "actualizar paquete(s)"
@@ -2191,8 +2191,7 @@ msgstr "no verificar el grupo de los archivos"
msgid "don't verify modification time of files"
msgstr "no verificar el tiempo de modificación de los archivos"
-#: lib/poptQV.c:271
-#: lib/poptQV.c:274
+#: lib/poptQV.c:271 lib/poptQV.c:274
msgid "don't verify mode of files"
msgstr "no verificar el modo de los archivos"
@@ -2208,13 +2207,11 @@ msgstr "no verificar los contextos de seguridad del archivo"
msgid "don't verify files in package"
msgstr "no verificar los archivos en el paquete"
-#: lib/poptQV.c:284
-#: tools/rpmgraph.c:244
+#: lib/poptQV.c:284 tools/rpmgraph.c:244
msgid "don't verify package dependencies"
msgstr "no verificar las dependencias de paquetes"
-#: lib/poptQV.c:287
-#: lib/poptQV.c:290
+#: lib/poptQV.c:287 lib/poptQV.c:290
msgid "don't execute verify script(s)"
msgstr "no ejecutar scripts de verificación"
@@ -2338,18 +2335,12 @@ msgstr "grupo %s no contiene ningún paquete\n"
msgid "no package triggers %s\n"
msgstr "sin detonante de paquetes %s\n"
-#: lib/query.c:353
-#: lib/query.c:374
-#: lib/query.c:395
-#: lib/query.c:420
+#: lib/query.c:353 lib/query.c:374 lib/query.c:395 lib/query.c:420
#, c-format
msgid "malformed %s: %s\n"
msgstr "%s mal formado: %s\n"
-#: lib/query.c:363
-#: lib/query.c:380
-#: lib/query.c:406
-#: lib/query.c:425
+#: lib/query.c:363 lib/query.c:380 lib/query.c:406 lib/query.c:425
#, c-format
msgid "no package matches %s: %s\n"
msgstr "ningún paquete coincide con %s: %s\n"
@@ -2384,8 +2375,7 @@ msgstr "número de paquete inválido: %s\n"
msgid "record %u could not be read\n"
msgstr "el registro %u no pudo ser leído\n"
-#: lib/query.c:518
-#: lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "el paquete %s no está instalado\n"
@@ -2395,8 +2385,7 @@ msgstr "el paquete %s no está instalado\n"
msgid "unknown tag: \"%s\"\n"
msgstr "etiqueta desconocida:\"%s\"\n"
-#: lib/rpmchecksig.c:51
-#: lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: falló la apertura: %s\n"
@@ -2411,8 +2400,7 @@ msgstr "%s: Fwrite falló: %s\n"
msgid "%s: Fflush failed: %s\n"
msgstr "%s: Fflush fallido: %s\n"
-#: lib/rpmchecksig.c:200
-#: lib/rpmchecksig.c:314
+#: lib/rpmchecksig.c:200 lib/rpmchecksig.c:314
msgid "rpmMkTemp failed\n"
msgstr "faló makeTempFile\n"
@@ -2431,57 +2419,63 @@ msgstr "%s: writeLead falló: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature falló: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: falló la importación.\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: no es una clave pública con armadura.\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: falló la lectura para importar(%d).\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead falló\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
-msgstr "%s: la cabecera de región no modificable no pudo ser leída. ¿Estará corrupto el paquete?\n"
+msgstr ""
+"%s: la cabecera de región no modificable no pudo ser leída. ¿Estará corrupto "
+"el paquete?\n"
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr "omitiendo paquete %s con firma V%u inverificable\n"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "NO ESTA BIEN"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "BIEN"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (FALTAN LAS CLAVES:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (CLAVES NO CONFIABLES:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
-#: lib/rpmchroot.c:58
-#: lib/rpmchroot.c:83
+#: lib/rpmchroot.c:58 lib/rpmchroot.c:83
#, c-format
msgid "%s: chroot directory not set\n"
msgstr "%s: no se ha definido chroot de directorio\n"
@@ -2504,72 +2498,78 @@ msgstr "NO "
msgid "YES"
msgstr "SI"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr "PreReq:, Provides:, y Obsoletes: dependencias soportan versiones."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
-msgstr "nombres de archivos almacenados como (dirName,baseName,dirIndex) \"tuple\", no como ruta."
+msgstr ""
+"nombres de archivos almacenados como (dirName,baseName,dirIndex) \"tuple\", "
+"no como ruta."
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "la carga del paquete puede ser comprimida utilizando bzip2."
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr "la carga del paquete puede ser comprimida utilizando xz."
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr "la carga del paquete puede ser comprimida tilizando bzip2. "
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "los archivos de carga del paquete tienen el prefijo \"./\"."
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
-msgstr "nombre-versión-lanzamiento del paquete no se proporciona implícitamente."
+msgstr ""
+"nombre-versión-lanzamiento del paquete no se proporciona implícitamente."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
-msgstr "las etiquetas del encabezado son siempre ordenadas después de ser cargadas."
+msgstr ""
+"las etiquetas del encabezado son siempre ordenadas después de ser cargadas."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr "el intérprete de scriptlet puede utilizar argumentos del encabezado."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
-msgstr "un conjunto de enlaces fijos de archivo puede ser instalado aunque no se haya completado."
+msgstr ""
+"un conjunto de enlaces fijos de archivo puede ser instalado aunque no se "
+"haya completado."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
-msgstr "scriplets de paquete pueden acceder a la base de datos rpm mientras se está imstalando."
+msgstr ""
+"scriplets de paquete pueden acceder a la base de datos rpm mientras se está "
+"imstalando."
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "soporte interno para scripts lua."
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr "el algoritmo de digest se puede configurar por paquete"
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr "soporte para capacidades de archivo POSIX1e."
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
msgid "package scriptlets can be expanded at install time."
-msgstr "los scriptlets de los paquetes pueden ser expandidos en el momento de la instalación."
+msgstr ""
+"los scriptlets de los paquetes pueden ser expandidos en el momento de la "
+"instalación."
-#: lib/rpmgi.c:48
-#: lib/rpminstall.c:115
-#: lib/rpminstall.c:292
-#: lib/rpminstall.c:323
-#: tools/rpmgraph.c:119
-#: tools/rpmgraph.c:156
+#: lib/rpmgi.c:48 lib/rpminstall.c:115 lib/rpminstall.c:292
+#: lib/rpminstall.c:323 tools/rpmgraph.c:119 tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
msgstr "la apertura de %s falló: %s\n"
@@ -2587,8 +2587,7 @@ msgstr "Preparando..."
msgid "Preparing packages for installation..."
msgstr "Preparando paquetes para la instalación..."
-#: lib/rpminstall.c:254
-#: tools/rpmgraph.c:194
+#: lib/rpminstall.c:254 tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Error de dependencias:\n"
@@ -2597,49 +2596,47 @@ msgstr "Error de dependencias:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: no es un paquete rpm (o manifiesto de paquete): %s\n"
-#: lib/rpminstall.c:345
-#: lib/rpminstall.c:729
-#: tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s no puede ser instalado\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Recuperando %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "omitiendo %s - transferencia fallida\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "paquete %s no es reubicable\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "error al leer del archivo %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "el archivo %s requiere una version de RPM más reciente\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" especifica varios paquetes:\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "no se puede abrir %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Instalando %s\n"
@@ -2665,8 +2662,7 @@ msgstr "falló la lectura: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "no es un paquete rpm\n"
-#: lib/rpmlock.c:102
-#: lib/rpmlock.c:109
+#: lib/rpmlock.c:102 lib/rpmlock.c:109
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "no es posible crear el bloqueo %s sobre %s (%s)\n"
@@ -2708,7 +2704,9 @@ msgstr "conflicto del archivo %s entre instalaciones intentadas de %s y %s"
#: lib/rpmprob.c:136
#, c-format
msgid "file %s from install of %s conflicts with file from package %s"
-msgstr "el archivo %s de la instalación de %s entra en conflicto con el archivo del paquete %s"
+msgstr ""
+"el archivo %s de la instalación de %s entra en conflicto con el archivo del "
+"paquete %s"
#: lib/rpmprob.c:141
#, c-format
@@ -2718,21 +2716,23 @@ msgstr "el paquete %s (que es más nuevo que %s) ya está instalado"
#: lib/rpmprob.c:146
#, c-format
msgid "installing package %s needs %<PRIu64>%cB on the %s filesystem"
-msgstr "para la instalación del paquete %s es necesario %<PRIu64>%cB en el sistema de archivos %s"
+msgstr ""
+"para la instalación del paquete %s es necesario %<PRIu64>%cB en el sistema "
+"de archivos %s"
#: lib/rpmprob.c:156
#, c-format
msgid "installing package %s needs %<PRIu64> inodes on the %s filesystem"
-msgstr "para la instalación del paquete %s es necesario %<PRIu64> inodos en el sistema de archivos %s"
+msgstr ""
+"para la instalación del paquete %s es necesario %<PRIu64> inodos en el "
+"sistema de archivos %s"
#: lib/rpmprob.c:160
#, c-format
msgid "%s is needed by %s%s"
msgstr "%s es necesario por %s%s"
-#: lib/rpmprob.c:162
-#: lib/rpmprob.c:167
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:162 lib/rpmprob.c:167 lib/rpmprob.c:172
msgid "(installed) "
msgstr "(instalado) "
@@ -2749,7 +2749,8 @@ msgstr "%s es sustituido por %s%s"
#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
-msgstr "se encontró el error desconocido %d mientras se manipulaba el paquete %s"
+msgstr ""
+"se encontró el error desconocido %d mientras se manipulaba el paquete %s"
#: lib/rpmrc.c:186
#, c-format
@@ -2791,8 +2792,7 @@ msgstr "Demasiados argumentos en la línea predeterminada en %s:%d\n"
msgid "missing ':' (found 0x%02x) at %s:%d\n"
msgstr "':' faltante (se encontró 0x%02x) en %s:%d\n"
-#: lib/rpmrc.c:503
-#: lib/rpmrc.c:543
+#: lib/rpmrc.c:503 lib/rpmrc.c:543
#, c-format
msgid "missing argument for %s at %s:%d\n"
msgstr "falta argumento para %s en %s:%d\n"
@@ -2829,7 +2829,8 @@ msgstr "No se puede abrir %s para lectura: %m.\n"
#: lib/rpmscript.c:72
msgid "<lua> scriptlet support not built in\n"
-msgstr "soporte interno para macro de inclución de guiones <lua>, no fue construido\n"
+msgstr ""
+"soporte interno para macro de inclución de guiones <lua>, no fue construido\n"
#: lib/rpmscript.c:185
#, c-format
@@ -2860,14 +2861,34 @@ msgstr "%s: macro de ejecución de guión fallido, estado de terminación %d\n"
msgid "Unknown format"
msgstr "formato desconocido"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
msgid "install"
msgstr "instalar "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr "borrar"
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "falló al abrir %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "falló al abrir %s: %s\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Falló al renombrar %s to %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2893,7 +2914,7 @@ msgstr "')' ausente en la etiqueta del paquete: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: lectura de la clave publica fallida.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr "transacción"
@@ -2924,7 +2945,8 @@ msgstr "sigh blob(%d): INVALIDO, la lectura devolvió %d\n"
#: lib/signature.c:233
#, c-format
msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
-msgstr "sigh tag[%d]: INVALIDO, etiqueta %d tipo %d desplazamiento %d contador %d\n"
+msgstr ""
+"sigh tag[%d]: INVALIDO, etiqueta %d tipo %d desplazamiento %d contador %d\n"
#: lib/signature.c:243
msgid "sigh load: BAD\n"
@@ -2940,71 +2962,81 @@ msgstr "sigh pad(%zd): INVALIDO, lectura de %zd bytes\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "sigh sigSize(%zd): INVALIDO, fstat(2) falló\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr "No se pudo crear la tuberia para firmar: %m"
-#: lib/signature.c:375
-#: lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "No se pudo ejecutar %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "falló la llamada al sistema exec para gpg (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "gpg falló al escribir la firma\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "incapaz de leer la firma\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
-msgstr "No se pudo leer la región inmutable del encabezado. ¿El paquete esta corrupto?\n"
+msgstr ""
+"No se pudo leer la región inmutable del encabezado. ¿El paquete esta "
+"corrupto?\n"
-#: lib/signature.c:666
-#: lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "spec %%_signature no válido en archivo de macro\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Debe establecer \"%%_gpg_name\" en su archivo de macro\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr "Resumen MD5: "
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "Resumen SHA1 del encabezado:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Encabezado"
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "Verificar firma: PARÁMETROS ERRÓNEOS\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Firma: DESCONOCIDA (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr "ignorado"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "failed"
msgstr "falló"
@@ -3058,8 +3090,7 @@ msgstr "se esperaba ? en la expresión"
msgid "{ expected after ? in expression"
msgstr "se esperaba { después de ? en la expresión"
-#: lib/headerfmt.c:515
-#: lib/headerfmt.c:555
+#: lib/headerfmt.c:515 lib/headerfmt.c:555
msgid "} expected in expression"
msgstr "se esperaba } en la expresión"
@@ -3085,7 +3116,9 @@ msgstr "inicializar base de datos"
#: lib/poptDB.c:20
msgid "rebuild database inverted lists from installed package headers"
-msgstr "reconstruir lista invertida de la base de datos desde los encabezados de paquetes instalados"
+msgstr ""
+"reconstruir lista invertida de la base de datos desde los encabezados de "
+"paquetes instalados"
#: lib/poptDB.c:23
msgid "verify database files"
@@ -3105,12 +3138,8 @@ msgstr "no se pudo abrir índice %s utilizando db%d - %s (%d)\n"
msgid "no dbpath has been set\n"
msgstr "no se ha establecido dbpath\n"
-#: lib/rpmdb.c:865
-#: lib/rpmdb.c:984
-#: lib/rpmdb.c:1029
-#: lib/rpmdb.c:1889
-#: lib/rpmdb.c:2010
-#: lib/rpmdb.c:2561
+#: lib/rpmdb.c:865 lib/rpmdb.c:984 lib/rpmdb.c:1029 lib/rpmdb.c:1889
+#: lib/rpmdb.c:2010 lib/rpmdb.c:2561
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "error(%d) obteniendo registros \"%s\" del índice %s\n"
@@ -3209,11 +3238,14 @@ msgstr "no se puede añadir el registro original en %u\n"
#: lib/rpmdb.c:2867
msgid "failed to rebuild database: original database remains in place\n"
-msgstr "falló la reconstrucción de la base de datos: la base de datos original permanece en su lugar\n"
+msgstr ""
+"falló la reconstrucción de la base de datos: la base de datos original "
+"permanece en su lugar\n"
#: lib/rpmdb.c:2875
msgid "failed to replace old database with new database!\n"
-msgstr "¡falló el remplazo de la base de datos antigua con la nueva base de datos!\n"
+msgstr ""
+"¡falló el remplazo de la base de datos antigua con la nueva base de datos!\n"
#: lib/rpmdb.c:2877
#, c-format
@@ -3261,12 +3293,14 @@ msgstr "%s tiene un valor numérico no válido, omitido\n"
#: lib/backend/dbconfig.c:202
#, c-format
msgid "%s has too large or too small long value, skipped\n"
-msgstr "%s tiene un valor largo demasiado grande o demasiado pequeño, omitido\n"
+msgstr ""
+"%s tiene un valor largo demasiado grande o demasiado pequeño, omitido\n"
#: lib/backend/dbconfig.c:211
#, c-format
msgid "%s has too large or too small integer value, skipped\n"
-msgstr "%s tiene un valor entero demasiado grande o demasiado pequeño, omitido\n"
+msgstr ""
+"%s tiene un valor entero demasiado grande o demasiado pequeño, omitido\n"
#: python/rpmts-py.c:165
#, c-format
@@ -3288,8 +3322,7 @@ msgstr "%3d>%*s(vacío)"
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(vacío)\n"
-#: rpmio/macro.c:565
-#: rpmio/macro.c:603
+#: rpmio/macro.c:565 rpmio/macro.c:603
#, c-format
msgid "Macro %%%s has unterminated body\n"
msgstr "El macro %%%s tiene un cuerpo incompleto\n"
@@ -3332,10 +3365,10 @@ msgstr "Opción desconocida %c en %s(%s)\n"
#: rpmio/macro.c:1049
#, c-format
msgid "Recursion depth(%d) greater than max(%d)\n"
-msgstr "La profundidad de recursión (%d) es mayor que el máximo permitido (%d)\n"
+msgstr ""
+"La profundidad de recursión (%d) es mayor que el máximo permitido (%d)\n"
-#: rpmio/macro.c:1118
-#: rpmio/macro.c:1135
+#: rpmio/macro.c:1118 rpmio/macro.c:1135
#, c-format
msgid "Unterminated %c: %s\n"
msgstr "No terminado %c: %s\n"
@@ -3354,8 +3387,7 @@ msgstr "Desborde del búfer de destino\n"
msgid "error creating temporary file %s: %m\n"
msgstr "error al crear el archivo temporal %s: %m\n"
-#: rpmio/rpmfileutil.c:342
-#: rpmio/rpmfileutil.c:348
+#: rpmio/rpmfileutil.c:342 rpmio/rpmfileutil.c:348
#, c-format
msgid "File %s: %s\n"
msgstr "Archivo %s: %s\n"
@@ -3379,8 +3411,7 @@ msgstr "sintaxis no válida en el macro de ejecución de scriptlet lua: %s\n"
msgid "invalid syntax in lua script: %s\n"
msgstr "sintaxis no valida en el scriptlet lua: %s\n"
-#: rpmio/rpmlua.c:482
-#: rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
#, c-format
msgid "lua script failed: %s\n"
msgstr "falló el scriptlet lua: %s\n"
@@ -3399,9 +3430,7 @@ msgstr "falló el enlace de lua: %s\n"
msgid "(no error)"
msgstr "(ningún error)"
-#: rpmio/rpmlog.c:148
-#: rpmio/rpmlog.c:149
-#: rpmio/rpmlog.c:150
+#: rpmio/rpmlog.c:148 rpmio/rpmlog.c:149 rpmio/rpmlog.c:150
msgid "fatal error: "
msgstr "error fatal:"
@@ -3418,16 +3447,16 @@ msgstr "advertencia:"
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "la asignación de memoria (%u bytes) retornó NULL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "V%d %s/%s %s, ID de clave %s"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
msgid "(none)"
msgstr "(ninguno)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Falló al intentar registrar el manipulador de fork: %m\n"
@@ -3543,9 +3572,6 @@ msgstr "no verificar firma de encabezado+carga"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "falló stat %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "falló al abrir %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "el archivo %s está en un dispositivo desconocido\n"
diff --git a/po/fi.po b/po/fi.po
index 8a714243e..7b4f24ade 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm-4.4.90\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2008-03-11 11:15+0200\n"
"Last-Translator: Panu Matilainen <pmatilai@redhat.com>\n"
"Language-Team: Finnish\n"
@@ -319,31 +319,31 @@ msgstr "suoritus epäonnistui\n"
msgid "no packages files given for rebuild"
msgstr "uudelleenkäännolle ei määritelty paketteja"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "käännökselle ei annettu määrittelytiedostoja"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "käännökselle ei määritelty tar-tiedostoja"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "poistolle ei määritelty paketteja"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "asennukselle ei määritelty paketteja"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "kyselylle ei annettu parametrejä"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "tarkistukselle ei annettu parametrejä"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "ei annettu parametrejä"
@@ -548,7 +548,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr "%s: julkisen avaimen luku epäonnistui\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: ei ole panssaroitu julkinen avain.\n"
@@ -573,7 +573,7 @@ msgstr "Tiedosto tarvitsee aloitusmerkin \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Täydennys ei sallittu: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Tiedostoa ei löytynyt täydennyksellä: %s\n"
@@ -816,12 +816,12 @@ msgstr "%s:n suoritus epäonnistui.\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Paketin tarkistus \"%s\" epäonnistui.\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Tiedostonimen muodostus paketille %s ei onnistu: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "%s:n luonti ei onnistu: %s\n"
@@ -1001,37 +1001,37 @@ msgstr "rivi %d: virheellinen käännösarkkitehtuurin muoto: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Virheellinen pakettimäärittely: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Paketti on jo olemassa: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "rivi %d: tuntematon nimiö: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} ei voi olla tyhjä\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} ei voi olla \"/\"\n"
@@ -1392,7 +1392,6 @@ msgid "Conversion of %s to long integer failed.\n"
msgstr ""
#: build/rpmfc.c:834
-#,
msgid "No file attributes configured\n"
msgstr ""
@@ -1472,7 +1471,6 @@ msgid "Missing hard link(s)"
msgstr ""
#: lib/cpio.c:226
-#,
msgid "Digest mismatch"
msgstr "Tarkistussumma ei täsmää"
@@ -1575,32 +1573,32 @@ msgstr "käyttäjää %s ei ole olemassa, käytetään käyttäjää root\n"
msgid "group %s does not exist - using root\n"
msgstr "ryhmää %s ei ole olemassa, käytetään ryhmää root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s talletettiin %s:nä\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s %s rmdir epäonnistui - hakemisto ei ole tyhjä\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s %s:n rmdir epäonnistui: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s luotu %s:na\n"
@@ -1680,12 +1678,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature epäonnistui: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ei allekirjoitusta saatavilla\n"
@@ -1695,7 +1693,7 @@ msgstr "%s: Ei allekirjoitusta saatavilla\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: otsikon luku epäonnistui: %s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Tiedoston luku epäonnistui: %s\n"
@@ -1868,7 +1866,7 @@ msgstr "lyhenne parametreille --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "päivitä vain jo asennetut paketit"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<pakettitiedosto>+"
@@ -1905,7 +1903,6 @@ msgid "do not verify package dependencies"
msgstr "älä tarkista paketin riippuvuuksia"
#: lib/poptI.c:204 lib/poptQV.c:251 lib/poptQV.c:253
-#,
msgid "don't verify digest of files"
msgstr "älä tarkista tiedostojen tarkistussummia"
@@ -1970,6 +1967,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "älä suorita %%triggerpostun scriptejä"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1977,39 +1978,39 @@ msgstr ""
"päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
"automaattisesti)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "tulosta asennuksen eteneminen prosentteina"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<hakemisto>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<vanha>=<uusi>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "älä huomioi tiedostokonflikteja pakettien välillä"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "asenna uudelleen, jos paketti on jo asennettu"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "älä asenna, mutta kerro onnistuisiko se"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "päivitä paketteja"
@@ -2322,7 +2323,7 @@ msgstr "virheellinen paketin numero: %s\n"
msgid "record %u could not be read\n"
msgstr "tietuetta %u ei voitu lukea\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
@@ -2332,7 +2333,7 @@ msgstr "paketti %s ei ole asennettu\n"
msgid "unknown tag: \"%s\"\n"
msgstr "tuntematon nimiö: \"%s\"\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: avaus epäonnistui: %s\n"
@@ -2366,52 +2367,57 @@ msgstr "%s: writeLead epäonnistui: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature epäonnistui: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
-msgstr ""
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
+msgstr "%s: julkisen avaimen luku epäonnistui\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: ei ole panssaroitu julkinen avain.\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr ""
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead epäonnistui\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr "ohitetaan paketti %s jonka V%u allekirjoitusta ei voida varmentaa\n"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "EI OK"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr ""
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr "(PUUTTUVIA AVAIMIA:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (EPÄLUOTETTAVIA AVAIMIA:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ""
@@ -2438,64 +2444,63 @@ msgstr "EI "
msgid "YES"
msgstr "KYLLÄ "
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr ""
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
-#,
+#: lib/rpmds.c:895
msgid "package scriptlets can be expanded at install time."
msgstr ""
@@ -2527,47 +2532,47 @@ msgstr "Puuttuvia riippuvuuksia:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: ei ole rpm paketti (tai pakettilista): %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s:ää ei voida asentaa\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Haetaan %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "ohitetaan %s - siirto epäonnistui\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "paketti %s ei ole uudelleensijoitettava\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "virhe luettaessa tiedostosta %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "tiedosto %s vaatii uudemmat version RPM:stä\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" määrittää useita paketteja:\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "virhe: en voi avata %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Asennetaan %s\n"
@@ -2786,14 +2791,34 @@ msgstr "%s skripti epäonnistui, palautti %d\n"
msgid "Unknown format"
msgstr "Tuntematon formaatti"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
msgid "install"
msgstr ""
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "%s:n avaus epäonnistui: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "En voi lukea %s: %s.\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Uudelleen nimeäminen %s -> %s epäonnistui: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2819,7 +2844,7 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr "%s: julkisen avaimen luku epäonnistui.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2866,69 +2891,79 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "%s:ää ei voitu suorittaa: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "gpg:n suoritus epäonnistui (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "gpg ei voinut kirjoittaa allekirjoitusta\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "en voinut lukea allekirjoitusta\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Sinun pitää asettaa \"gpg_name:\" makrotiedostossasi\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr ""
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Otsikko "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "failed"
msgstr "epäonnistui"
@@ -3332,16 +3367,16 @@ msgstr "varoitus: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "muistin varaus (%u tavua) palautti NULL:in.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr ""
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
msgid "(none)"
msgstr "(ei mitään)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, c-format
msgid "Failed to register fork handler: %m\n"
msgstr ""
@@ -3376,9 +3411,6 @@ msgstr "älä tarkista otsikon ja kuorman allekirjoitusta"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "%s:n stat epäonnistui: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "%s:n avaus epäonnistui: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "tiedosto %s sijaitsee tuntemattomalla laitteella\n"
@@ -3511,9 +3543,6 @@ msgstr "älä tarkista otsikon ja kuorman allekirjoitusta"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: headerGetEntry epäonnistui\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "En voi lukea %s: %s.\n"
-
#~ msgid "getcwd failed: %m\n"
#~ msgstr "getcwd epäonnistui: %m\n"
diff --git a/po/fr.po b/po/fr.po
index c8ee1b875..96d7e70d5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM 4.2.1\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2003-07-06 01:36+0200\n"
"Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
"Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -336,31 +336,31 @@ msgstr "echec de l'exec\n"
msgid "no packages files given for rebuild"
msgstr "aucun paquetage spécifié pour reconstruction"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "aucun fichier spec spécifié pour construction"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "aucun fichier tar spécifié pour construction"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "n'a aucun paquetage à désinstaller"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "n'a aucun paquetage à installer"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "aucun argument fourni à la requête"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "aucun argument fourni à la vérification"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "aucun argument fourni"
@@ -566,7 +566,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr "%s: échec de la lecture de la clé publique.\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s n'est pas une clé publique blindée.\n"
@@ -591,7 +591,7 @@ msgstr "Le fichier non précédé d'un \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Substitution non permise: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Fichier non trouvé par la substitution: %s\n"
@@ -834,12 +834,12 @@ msgstr "L'exec de %s a échoué (%s): %s\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Mauvaise phrase de passe\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Ne peut générer le nom de fichier pour le package %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "Ne peut créer %s: %s\n"
@@ -1019,37 +1019,37 @@ msgstr "ligne %d: mauvais format pour BuildArchitecture: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Erreur interne: tag bidon %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "ligne %d: Version requise: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Mauvaise specification de paquetage: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Paquetage déjà existant: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "ligne %d: tag inconnu: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "BuildRoot ne peut pas être \"/\": %s\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "BuildRoot ne peut pas être \"/\": %s\n"
@@ -1619,32 +1619,32 @@ msgstr "utilisateur %s inexistant - utilisation de root\n"
msgid "group %s does not exist - using root\n"
msgstr "groupe %s inexistant - utilisation de root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "l'archive %s n'était pas dans la liste de fichiers d'entêtes\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s sauvé en tant que %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s échec du rmdir sur %s : répertoire non-vide\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s échec du rmdir sur %s: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s n'a pu délier %s: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s créé en tant que %s\n"
@@ -1726,12 +1726,12 @@ msgstr "hdr blob(%d): PASBON, la lecture renvoie %d\n"
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: échec de rpmReadSignature: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: aucune signature disponible\n"
@@ -1741,7 +1741,7 @@ msgstr "%s: aucune signature disponible\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead a échoué: %s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread a échoué: %s\n"
@@ -1916,7 +1916,7 @@ msgstr "raccourci pour --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "met à jour le(s) paquetage(s) déjà installé(s)"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<paquetage>+"
@@ -2025,6 +2025,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "n'exécuter aucun scriptlet %%triggerpostun"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2032,39 +2036,39 @@ msgstr ""
"mettre à jour avec un paquetage plus ancien (une m-à-j avec --force fait ça "
"automatiquement"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "afficher le pourcentage d'installation du paquetage"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "reloge le paquetage vers <rep>, si relogeable"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<rep>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "reloge les fichiers du <vieux> chemin vers <nouveau>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<vieux>=<nouveau>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "réinstalle si le paquetage est déjà installé"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "n'installe pas, mais dit si ça marcherait ou pas"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "mises à jour des paquetages"
@@ -2388,7 +2392,7 @@ msgstr "numéro de paquetage invalide: %s\n"
msgid "record %u could not be read\n"
msgstr "impossible de lire l'article %u\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "le paquetage %s n'est pas installé\n"
@@ -2398,7 +2402,7 @@ msgstr "le paquetage %s n'est pas installé\n"
msgid "unknown tag: \"%s\"\n"
msgstr "tag inconnu: \"%s\"\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: échec de l'ouverture: %s\n"
@@ -2433,52 +2437,57 @@ msgstr "%s: échec de writeLead: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: échec de rpmWriteSignature: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: échec de l'import.\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s n'est pas une clé publique blindée.\n"
+
+#: lib/rpmchecksig.c:439
#, fuzzy, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: échec de la lecture d'import.\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: échec de headerRead\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "PAS OK"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (CLES MANQUANTES:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (CLES NONCREDIBLE:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2505,75 +2514,75 @@ msgstr "NON"
msgid "YES"
msgstr "OUI"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
"Les dépendances de type PreReq:, Provides: et Obsoletes: supportent les "
"versions."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
"Le(s) nom(s) de fichier sont stockés en tant que triplets (NomRep,NomFich,"
"IndexRep), pas en tant que chemin."
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
#, fuzzy
msgid "package payload can be compressed using bzip2."
msgstr "La charge utile du paquetage est compressée avec bzip2."
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
#, fuzzy
msgid "package payload can be compressed using xz."
msgstr "La charge utile du paquetage est compressée avec bzip2."
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
#, fuzzy
msgid "package payload can be compressed using lzma."
msgstr "La charge utile du paquetage est compressée avec bzip2."
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
"le(s) fichier(s) de la charge utile du paquetage ont \"./\" comme préfixe."
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr "le nom-version-révision du paquetage n'est pas implicitement fourni."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr "les tags d'entête sont toujours triés après avoir été chargés."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
"l'interprète du scriptlet peut utiliser des arguments à partir des entêtes."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr "un lien en dur pourrait être installé sans être complet."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
"les scriptlets du paquetage pourrait accéder à la base de données rpm "
"pendant l'installation."
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
#, fuzzy
msgid "internal support for lua scripts."
msgstr "- non supporté sur des chaînes de caractères\n"
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr ""
@@ -2608,47 +2617,47 @@ msgstr "Dépendances requises:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: n'est pas un paquetage rpm (ni une list de paquetages): %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ne peut être installé\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Récupération de %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "%s ignoré - échec du téléchargement - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "le paquetage %s n'est pas relogeable\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "erreur en lisant %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "le fichier %s demande une version plus récente de RPM\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" spécifie plusieurs paquetages\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Installation de %s\n"
@@ -2876,15 +2885,35 @@ msgstr "%s(%s-%s-%s) échec du scriplet, code de sortie %d\n"
msgid "Unknown format"
msgstr "tag inconnu"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "(déjà installé) "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "impossible d'ouvrir %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Impossible de lire %s: %s.\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Impossible de renommer %s en %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2910,7 +2939,7 @@ msgstr "')' manquante dans le label du paquetage: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: échec de la lecture de la clé publique.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2957,73 +2986,83 @@ msgstr "sigh pad(%d): PASBON, %d octets lus\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "taille du sigh(%d): PASBON, la lecture retourne %d\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "Impossible d'exécuter %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, fuzzy, c-format
msgid "gpg exec failed (%d)\n"
msgstr "echec de l'exec\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "échec de gpg à ecrire la signature\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "impossible de lire la signature\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "%%_signature spécifiée invalide dans le fichier de macros\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
"Vous devez affecter une valeur à \"%%_gpg_name\" dans votre fichier de "
"macros\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
#, fuzzy
msgid "MD5 digest:"
msgstr "Somme MD5: "
-#: lib/signature.c:780
+#: lib/signature.c:803
#, fuzzy
msgid "Header SHA1 digest:"
msgstr "Hachage de l'entête SHA1: "
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Entête "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "Verification de signature: MAUVAIS PARAMETRES\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signature: INCONNUE (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "échec %s: %s\n"
@@ -3436,17 +3475,17 @@ msgstr "attention: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "l'allocation de mémoire (%u octets) a retourné NULL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "signature V3 DSA: "
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(pas d'erreur)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Impossible de lire le fichier spec à %s\n"
@@ -3561,9 +3600,6 @@ msgstr "ne pas vérifier la signature de l'entete+charge_utile"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "échec de stat sur %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "impossible d'ouvrir %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "le fichier %s est sur un périphérique inconnu\n"
@@ -3758,9 +3794,6 @@ msgstr "ne pas vérifier la signature de l'entete+charge_utile"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: échec de headerGetEntry\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "Impossible de lire %s: %s.\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "échec de l'expansion de %s à %s:%d \"%s\"\n"
diff --git a/po/is.po b/po/is.po
index e1ea2231b..58ac6b7f1 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2001-07-12 13:25+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@@ -308,31 +308,31 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr ""
@@ -535,7 +535,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr "%s: Fseek brst: %s\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
@@ -560,7 +560,7 @@ msgstr ""
msgid "Glob not permitted: %s\n"
msgstr "Gat ekki opna PreUn skr: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Skrin fannst ekki me 'glob': %s\n"
@@ -804,12 +804,12 @@ msgstr "Gat ekki keyrt %s (%s): %s\n"
msgid "Package check \"%s\" failed.\n"
msgstr ""
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -989,37 +989,37 @@ msgstr ""
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "lna %d: leyfilegur rofi %s: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr ""
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1569,32 +1569,32 @@ msgstr ""
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s vista sem %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir %s brst: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s gat ekki eytt %s: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s bi til sem %s\n"
@@ -1674,12 +1674,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s rmdir %s brst: %s\n"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr ""
@@ -1689,7 +1689,7 @@ msgstr ""
msgid "%s: headerRead failed: %s"
msgstr "%s: Fseek brst: %s\n"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1863,7 +1863,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<pakkaskr>+"
@@ -1968,44 +1968,48 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<gmul>=<n>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "uppfra pakka"
@@ -2330,7 +2334,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2340,7 +2344,7 @@ msgstr ""
msgid "unknown tag: \"%s\"\n"
msgstr "ekkt tegund tknmyndar: %s\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
@@ -2375,52 +2379,57 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:411
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
+msgstr "%s: Fseek brst: %s\n"
+
+#: lib/rpmchecksig.c:395
#, fuzzy, c-format
-msgid "%s: import failed.\n"
+msgid "%s: key %d not an armored public key.\n"
msgstr "%s: Fseek brst: %s\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:439
#, fuzzy, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: Fseek brst: %s\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Fseek brst: %s\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr ""
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ""
@@ -2447,63 +2456,63 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr ""
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
msgid "package scriptlets can be expanded at install time."
msgstr ""
@@ -2536,47 +2545,47 @@ msgstr "gat ekki tbi pakkaskilyri:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "get ekki opna pakka gagnagrunn \n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "Skrin %s er ekki venjuleg skr.\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -2797,14 +2806,34 @@ msgstr "%s brst\n"
msgid "Unknown format"
msgstr "ekkt tegund tknmyndar: %s\n"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
msgid "install"
msgstr ""
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "gat ekki opna %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Get ekki lesi %s: %s.\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Gat ekki endurnefnt %s sem %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2830,7 +2859,7 @@ msgstr "vantar '(' %s %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: Fseek brst: %s\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2877,70 +2906,80 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Gat ekki keyrt %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, fuzzy, c-format
msgid "gpg exec failed (%d)\n"
msgstr "ggp brst\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "gpg get ekki lesi undirskriftina\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "get ekki lesi undirskriftina\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
#, fuzzy
msgid "Header SHA1 digest:"
msgstr "ekki yfirfara SHA1 undirritunina"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr ""
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s brst\n"
@@ -3348,17 +3387,17 @@ msgstr "avrun: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "minnisfrtekt (%u bta) skilai NULL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr ""
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(engin villa)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Gat ekki lesi spec skr fr %s\n"
@@ -3394,9 +3433,6 @@ msgstr "ekki skoa pakkaskilyrin"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "gat ekki skoa %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "gat ekki opna %s: %s\n"
-
#~ msgid "cannot open %s index\n"
#~ msgstr "get ekki opna %s index\n"
@@ -3491,9 +3527,6 @@ msgstr "ekki skoa pakkaskilyrin"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: gat ekki lesi manifest: %s\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "Get ekki lesi %s: %s.\n"
-
#, fuzzy
#~ msgid "getcwd failed: %m\n"
#~ msgstr "%s rmdir %s brst: %s\n"
diff --git a/po/it.po b/po/it.po
index c599d8dd3..188c7b3eb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2008-06-30 07:20+0200\n"
"Last-Translator: Francesco Tombolini <tombo@adamantio.net>\n"
"Language-Team: Italian <fedora-trans-it@redhat.com>\n"
@@ -351,31 +351,31 @@ msgstr "exec fallito\n"
msgid "no packages files given for rebuild"
msgstr "non è stato specificato alcun file del pacchetto per la ricompilazione"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "non è stato specificato alcun file spec per la compilazione"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "non è stato specificato alcun file tar per la compilazione"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "non è stato specificato alcun pacchetto per la rimozione"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "non è stato specificato alcun pacchetto per l'installazione"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "non è stato specificato alcun argomento per l'interrogazione"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "non è stato specificato alcun argomento per la verifica"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "non è stato specificato alcun argomento"
@@ -581,7 +581,7 @@ msgstr "%s: impossibile caricare tag sconosciuto (%d).\n"
msgid "%s: public key read failed.\n"
msgstr "%s: lettura chiave pubblica fallita.\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: non è una chiave pubblica con formato 'armored'.\n"
@@ -606,7 +606,7 @@ msgstr "Il file deve essere preceduto da \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob non permesso: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "File non trovato da glob: %s\n"
@@ -849,12 +849,12 @@ msgstr "Esecuzione di %s fallita (%s): %s\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Controllo frase chiave fallito\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Impossibile generare nome del file di output per il pacchetto %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "impossibile creare %s: %s\n"
@@ -1034,37 +1034,37 @@ msgstr "riga %d: Formato BuildArchitecture errato: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Errore interno: Etichetta Bogus %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "riga %d: Versione necessaria: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Specifiche errate del pacchetto: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Il pacchetto è già esistente: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "riga %d: Etichetta sconosciuta: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "La BuildRoot non può essere vuota\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "La BuildRoot non può essere \"/\"\n"
@@ -1626,33 +1626,33 @@ msgstr "l'utente %s non esiste - utilizzazione utente root\n"
msgid "group %s does not exist - using root\n"
msgstr "il gruppo %s non esiste - utilizzazione utente root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
"file archive %s non è stato trovato nell'elenco dei file di intestazione\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s salvato cme %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s rmdir di %s fallito: La cartella non è vuota\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir di %s fallito: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "scollegamento %s di %s fallito: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s creato come %s\n"
@@ -1732,12 +1732,12 @@ msgstr "hdr blob(%zd): BAD, la lettura restituisce %d\n"
msgid "hdr load: BAD\n"
msgstr "hdr load: BAD\n"
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature fallita: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Nessuna firma disponibile\n"
@@ -1747,7 +1747,7 @@ msgstr "%s: Nessuna firma disponibile\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead fallita: %s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread fallito: %s\n"
@@ -1921,7 +1921,7 @@ msgstr "abbreviazione di --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "aggiorna il pacchetto/i se già installati"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -2027,6 +2027,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "non eseguire alcun scriptlet %%triggerpostun"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2034,39 +2038,39 @@ msgstr ""
"aggiorna ad una versione più vecchia del pacchetto (sugli aggiornamenti --"
"force esegue questa operazione automaticamente)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "mostra le percentuali durante le installazioni del pacchetto"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "riposiziona il pacchetto su <dir>, se trasferibile"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "riposiziona i file dal path <old> su <new>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "ignora i file in conflitto fra pacchetti"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "installa nuovamente se il pacchetto è già presente"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "non installare, ma indicare se funziona oppure no"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "aggiorna il pacchetto/i"
@@ -2383,7 +2387,7 @@ msgstr "numero del pacchetto non valido: %s\n"
msgid "record %u could not be read\n"
msgstr "il record %lu non può essere letto\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "il pacchetto %s non è stato installato\n"
@@ -2393,7 +2397,7 @@ msgstr "il pacchetto %s non è stato installato\n"
msgid "unknown tag: \"%s\"\n"
msgstr "tag sconosciuto: \"%s\"\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: apertura fallita: %s\n"
@@ -2427,53 +2431,58 @@ msgstr "%s: writeLead fallito: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature fallito: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: importazione fallita.\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: non è una chiave pubblica con formato 'armored'.\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: lettura importazione fallita(%d).\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead fallito\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
"%s: La regione header immutabile non può essere letta. Pacchetto corrotto?\n"
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr "salto il pacchetto %s con firma V%u non verificabile\n"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "NON OK"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (CHIAVI MANCANTI:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (CHIAVI NON FIDATE:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2500,75 +2509,75 @@ msgstr "NO "
msgid "YES"
msgstr "SI"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
"PreReq:, Provides:, e Obsoletes: versioni per il supporto delle dipendenze."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
"file name conservati come tuple (dirName,baseName,dirIndex), non come "
"percorsi."
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "il payload del pacchetto può essere compresso utilizzando bzip2."
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
#, fuzzy
msgid "package payload can be compressed using xz."
msgstr "il payload del pacchetto può essere compresso utilizzando lzma."
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr "il payload del pacchetto può essere compresso utilizzando lzma."
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "il/i file payload del pacchetto presentano un prefisso \"./\""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
"il nome-versione-release del pacchetto non viene implicitamente fornito."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
"le etichette di intestazione vengono sempre ordinate dopo il loro "
"caricamento."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
"l'interpreter di scriptlet può utilizzare gli argomenti presenti "
"nell'intestazione."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr "un set di file hardlink può essere installato senza che sia completo."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
"le scriptlet del pacchetto potrebbero accedere al database rpm durante "
"l'installazione."
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "supporto interno per gli script lua."
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
#, fuzzy
msgid "file digest algorithm is per package configurable"
msgstr "l'algoritmo digest di checksum dei file è configurabile per pacchetto"
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr ""
@@ -2603,47 +2612,47 @@ msgstr "Dipendenze fallite:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: non è un pacchetto rpm (o un manifesto del pacchetto): %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s non può essere installato\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Ripristino di %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "omissione %s - trasferimento fallito - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "il pacchetto %s non è riposizionabile\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "errore di lettura dal file %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "il file %s necessita di una nuova versione di RPM\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" specifica pacchetti multipli\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "impossibile aprire %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "installazione di %s in corso\n"
@@ -2875,15 +2884,35 @@ msgstr "scriptlet %s fallita, uscita con stato %d\n"
msgid "Unknown format"
msgstr "Sconosciuta"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "(installato) "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "impossibile aprire %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Lettura di %s fallita: %s.\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Impossibile rinominare %s in %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2909,7 +2938,7 @@ msgstr "')' mancante nell'etichetta del pacchetto: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: lettura chiave pubblica fallita.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
#, fuzzy
msgid "transaction"
msgstr "creazione set transazione"
@@ -2957,70 +2986,80 @@ msgstr "sigh pad(%zd): BAD, lettura %zd byte\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "sigh sigSize(%zd): BAD, fstat(2) fallito\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr "Impossibile creare la pipe per la firma: %m"
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "Impossibile eseguire %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "esecuzione gpg fallita (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "pgp non è riuscito a salvare la firma\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "impossibile leggere la firma\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
"Impossibile leggere la regione immutabile dell'header. Pacchetto corrotto?\n"
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Specifica %%_signature non valida nel file macro\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "È necessario impostare \"%%_gpg_name\" nel file macro\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr "MD5 digest:"
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "Digest SHA1 Header:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Header "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "Verifica firma: PARAMETRI ERRATI\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Firma: SCONOSCIUTA (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s fallito\n"
@@ -3433,17 +3472,17 @@ msgstr "avvertimento: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "allocazione memoria (%u byte) ritornata NULLA.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "firma %sV%d %s : %s, ID chiave %s\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(nessun errore)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Impossibile leggere il file spec da %s\n"
@@ -3549,9 +3588,6 @@ msgstr "non verificare firma header+payload"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "impossibile visualizzare statistiche per %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "impossibile aprire %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "file %s è su di un dispositivo sconosciuto\n"
@@ -3741,9 +3777,6 @@ msgstr "non verificare firma header+payload"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: headerGetEntry fallito\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "Lettura di %s fallita: %s.\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "espansione %s su %s fallita:%d \"%s\"\n"
diff --git a/po/ja.po b/po/ja.po
index f1593fd3c..f77b163f7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm-4.8\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2010-06-08 07:11+0900\n"
"Last-Translator: SEKINE Tatsuo <tsekine@sdri.co.jp>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -256,16 +256,16 @@ msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-"トリガーを無効にするようなオプションはパッケージのインストール、削除時のみ"
-"指定できます。"
+"トリガーを無効にするようなオプションはパッケージのインストール、削除時のみ指"
+"定できます。"
#: rpmqv.c:474
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-"--nodeps はパッケージの作成、リビルド、リコンパイル、インストール、削除、"
-"検証時のみ指定できます。"
+"--nodeps はパッケージの作成、リビルド、リコンパイル、インストール、削除、検証"
+"時のみ指定できます。"
#: rpmqv.c:479
msgid ""
@@ -278,8 +278,8 @@ msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-"--root (-r) はインストール、削除、問い合わせ、データベース再構築時のみ"
-"指定できます"
+"--root (-r) はインストール、削除、問い合わせ、データベース再構築時のみ指定で"
+"きます"
#: rpmqv.c:495
msgid "arguments to --root (-r) must begin with a /"
@@ -332,31 +332,31 @@ msgstr "実行失敗\n"
msgid "no packages files given for rebuild"
msgstr "リビルドするパッケージが指定されていません。"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "ビルドのための spec ファイルが指定されていません。"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "ビルドのための tar ファイルが指定されていません。"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "アンインストールするパッケージが指定されていません。"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "インストールするパッケージが指定されていません。"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "問い合わせのための引数が指定されていません。"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "検証のための引数が指定されていません。"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "引数が指定されていません。"
@@ -525,7 +525,9 @@ msgstr "他のフォームで特別な %%doc を混ぜることはできませ
#: build/files.c:1091
#, c-format
msgid "Unknown file digest algorithm %u, falling back to MD5\n"
-msgstr "不明なファイルのダイジェスト アルゴリズム %u です。MD5 にフォールバックします。\n"
+msgstr ""
+"不明なファイルのダイジェスト アルゴリズム %u です。MD5 にフォールバックしま"
+"す。\n"
#: build/files.c:1117
#, c-format
@@ -562,7 +564,7 @@ msgstr "%s: 不明なタグ (%d) を読み込めませんでした。\n"
msgid "%s: public key read failed.\n"
msgstr "%s: 公開鍵の読み込みに失敗しました。\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: ASCII 形式の公開鍵ではありません。\n"
@@ -587,7 +589,7 @@ msgstr "ファイルは先頭に \"/\" が必要です: %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob は許可されていません: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "ファイルが見つかりません (by glob): %s\n"
@@ -830,12 +832,12 @@ msgstr "「%s」の実行に失敗しました。\n"
msgid "Package check \"%s\" failed.\n"
msgstr "パスフレーズのチェックに失敗しました。\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "パッケージ %s の出力ファイル名を生成できませんでした: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "%s を作成できません: %s\n"
@@ -1015,37 +1017,37 @@ msgstr "%d 行目: 不正な BuildArchtecture フォーマット: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "%d 行目: noarch サブ パッケージでのみサポート: %s\n"
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "内部エラー: にせのタグ %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "%d 行目: %s は非推奨: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "不正なパッケージの指定: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "パッケージは既に存在しています: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "%d 行目: 不明なタグ: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} を空にすることができません\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} を \"\" にすることができません\n"
@@ -1586,32 +1588,32 @@ msgstr "ユーザー %s は存在しません - root を使用します\n"
msgid "group %s does not exist - using root\n"
msgstr "グループ %s は存在しません - root を使用します\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "アーカイブファイル %s がヘッダーファイルリストにありません。\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s は %s として保存されました。\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s %s の rmdir に失敗: ディレクトリが空ではありません。\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s %s の rmdir に失敗: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s %s の unlink に失敗: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s は %s として作成されました。\n"
@@ -1691,12 +1693,12 @@ msgstr "ヘッダー blob(%zd): 異常です。読み込み結果は %d です
msgid "hdr load: BAD\n"
msgstr "ヘッダー ロード: 異常です。\n"
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature に失敗しました: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: 署名がありません。\n"
@@ -1706,7 +1708,7 @@ msgstr "%s: 署名がありません。\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead に失敗しました: %s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread に失敗しました: %s\n"
@@ -1878,7 +1880,7 @@ msgstr "--replacepkgs と --replacefiles を短縮したもの"
msgid "upgrade package(s) if already installed"
msgstr "既にインストール済みの場合のみアップグレード"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -1980,6 +1982,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "%%triggerpostun スクリプトを実行しません。"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1987,39 +1993,39 @@ msgstr ""
"古いバージョンのパッケージにアップグレードします(アップグレード時の --force "
"はこれを自動的に行います)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "インストールする際にパーセント表示を行います。"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "パッケージが再配置可能ならば、 <dir> に再配置します。"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "パス <old> からパス <new> にファイルを再配置させます。"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "パッケージ間のファイルの競合を無視します。"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "既に存在するパッケージでも再インストールします。"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "インストールせずに、テストのみを行います。"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "パッケージをアップグレードします。"
@@ -2073,7 +2079,8 @@ msgstr "<spec>"
#: lib/poptQV.c:111
msgid "query/verify package(s) from install transaction"
-msgstr "インストール トランザクションからのパッケージの問い合わせ/検証をします。"
+msgstr ""
+"インストール トランザクションからのパッケージの問い合わせ/検証をします。"
#: lib/poptQV.c:113
msgid "query the package(s) triggered by the package"
@@ -2332,7 +2339,7 @@ msgstr "無効なパッケージ番号: %s\n"
msgid "record %u could not be read\n"
msgstr "レコード %u は読み込めませんでした\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "パッケージ %s はインストールされていません。\n"
@@ -2342,7 +2349,7 @@ msgstr "パッケージ %s はインストールされていません。\n"
msgid "unknown tag: \"%s\"\n"
msgstr "不明なタグ: \"%s\"\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: オープンに失敗しました: %s\n"
@@ -2376,52 +2383,57 @@ msgstr "%s: writeLead に失敗しました: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature に失敗しました: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: インポートに失敗しました。\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: ASCII 形式の公開鍵ではありません。\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: インポート読み込みに失敗しました(%d)。\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead に失敗しました。\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "OK ではありません。"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr "(見つからない鍵:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr "(信頼できない鍵:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2448,66 +2460,66 @@ msgstr "NO "
msgid "YES"
msgstr "YES"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
"「PreReq:」「Provides:」「Obsoletes:」の依存関係をサポートしたバージョン。"
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
"ファイル名が、パスではなく (dirName, baseName, dirIndex) の組で格納されます。"
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "パッケージ ペイロードが bzip2 を用いて圧縮できます。"
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr "パッケージ ペイロードが xz を用いて圧縮できます。"
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr "パッケージ ペイロードが lzma を用いて圧縮できます。"
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "パッケージ ペイロード ファイルが「./」接頭語を持っています。"
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr "「パッケージ名-バージョン-リリース」が暗黙で提供されません。"
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr "ヘッダー タグが読み込まれた後、常にソートされます。"
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr "スクリプト インタプリターがヘッダーから引数を使用できます。"
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr "ハードリンク ファイル群が完全でなくてもインストールできます。"
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
"インストール中に、パッケージスクリプトが rpm データベースにアクセスできます。"
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "lua スクリプトの内部サポート。"
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr "ファイルのダイジェストアルゴリズムはパッケージ毎の設定です"
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr "POSIX..1e ファイル ケーパビリティ (capability) のためのサポート"
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
msgid "package scriptlets can be expanded at install time."
msgstr "パッケージのスクリプトはインストール時間を長くすることができます。"
@@ -2539,47 +2551,47 @@ msgstr "依存性の欠如:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: RPM パッケージ(またはパッケージのリスト)ではありません: %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s をインストールできません。\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "%s を取得中\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "%s をスキップします - 転送に失敗しました\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "パッケージ %s は再配置できません。\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "ファイル %s の読み込みエラー\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ファイル %s にはより新しいバージョンの RPM が必要です。\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" は複数のパッケージを指定しています:\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s を開けません: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "%s をインストール中です。\n"
@@ -2802,14 +2814,34 @@ msgstr "%s スクリプトの実行に失敗しました。終了ステータス
msgid "Unknown format"
msgstr "不明な書式"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
msgid "install"
msgstr "インストール"
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr "削除"
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "%s のオープンに失敗: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "%s の読み込みに失敗: %s。\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "%s を %s に名前を変更できませんでした: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2835,7 +2867,7 @@ msgstr "パッケージラベル中に「)」がありません: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: 公開鍵の読み込みに失敗しました。\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr "トランザクション"
@@ -2882,69 +2914,79 @@ msgstr "署名の pad 容量(%zd): 異常、%zd バイト読み込みました
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "署名の容量(%zd): 異常、fstat(2) に失敗しました。\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr "署名のためのパイプ作成ができません: %m"
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "%s を実行できませんでした: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "gpg の実行に失敗しました (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "gpg が署名を書き込むのに失敗しました。\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "署名を読み込めませんでした。\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "マクロファイル中の不正な %%_signature\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "マクロファイル内で \"%%_gpg_name\" を設定しなければなりません。\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr "MD5 ダイジェスト:"
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "ヘッダー SHA1 ダイジェスト:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "ヘッダー "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "署名確認: 異常なパラメータです。\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "署名: 未知(%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "failed"
msgstr "失敗"
@@ -3350,16 +3392,16 @@ msgstr "警告: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "メモリ割り当て (%u バイト) が NULL を返しました。\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "V%d %s/%s %s、鍵 ID %s"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
msgid "(none)"
msgstr "(なし)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "フォーク ハンドラーの登録に失敗しました: %m\n"
@@ -3473,9 +3515,6 @@ msgstr "ヘッダーとペイロード署名を検証しません。"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "stat %s に失敗しました: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "%s のオープンに失敗: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "ファイル %s は不明なデバイス上にあります。\n"
@@ -3664,9 +3703,6 @@ msgstr "ヘッダーとペイロード署名を検証しません。"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: headerGetEntry に失敗しました。\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "%s の読み込みに失敗: %s。\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "%s の展開に失敗しました (%s:%d) \"%s\"\n"
@@ -3775,7 +3811,8 @@ msgstr "ヘッダーとペイロード署名を検証しません。"
#~ msgstr "インストール要素データベースのインスタンスを取得できませんでした!\n"
#~ msgid "Could not get header for auto-rollback transaction!\n"
-#~ msgstr "自動ロールバックトランザクションのヘッダーを取得できませんでした。\n"
+#~ msgstr ""
+#~ "自動ロールバックトランザクションのヘッダーを取得できませんでした。\n"
#~ msgid "\tAdded from install element %s.\n"
#~ msgstr "\tインストール要素 %s から追加しました。\n"
diff --git a/po/ko.po b/po/ko.po
index feeeac2d4..d7e5f70bb 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.4\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2002-03-04 17:17+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"
@@ -316,31 +316,31 @@ msgstr "࿡ ߽ϴ\n"
msgid "no packages files given for rebuild"
msgstr "(rebuild) Ű ʾҽϴ"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "Ű ۿ ʿ spec ʾҽϴ"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "Ű ۿ ʿ tar ʾҽϴ"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr " Ű ʾҽϴ"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "ġ Ű ʾҽϴ"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "ǿ ʿ μ ʾҽϴ"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr " ʿ μ ʾҽϴ"
-#: rpmqv.c:784
+#: rpmqv.c:786
#, fuzzy
msgid "no arguments given"
msgstr "ǿ ʿ μ ʾҽϴ"
@@ -547,7 +547,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr "%s: readLead ߽ϴ\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
@@ -572,7 +572,7 @@ msgstr " \"/\" ؾ: %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob : %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "glob ã : %s\n"
@@ -813,12 +813,12 @@ msgstr "%s ࿡ (%s): %s\n"
msgid "Package check \"%s\" failed.\n"
msgstr "н (pass phrase) ùٸ ʽϴ\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "%s Ű ϸ : %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "%s() : %s\n"
@@ -998,37 +998,37 @@ msgstr "%d ° : ߸ BuildArchitecture Դϴ: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr " : Ž(Bogus) ± %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "%d ° : ʿմϴ: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "߸ Ű : %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Ű ̹ : %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "%d ° : ±Դϴ: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "BuildRoot \"/\" : %s\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "BuildRoot \"/\" : %s\n"
@@ -1587,32 +1587,32 @@ msgstr "%s ڰ ʽϴ - root ̿մϴ\n"
msgid "group %s does not exist - using root\n"
msgstr "%s ׷ ʽϴ - root ̿մϴ\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr " Ͽ ī̺ %s() ã ϴ\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s() %s() Ǿϴ\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s %s 丮 : 丮 ƴմϴ\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s %s 丮 : %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s %s ũ : %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s() %s() Ǿϴ\n"
@@ -1692,12 +1692,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature ߽ϴ\n"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: ȿ ϴ\n"
@@ -1707,7 +1707,7 @@ msgstr "%s: ȿ ϴ\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: readLead ߽ϴ\n"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread ߽ϴ: %s\n"
@@ -1890,7 +1890,7 @@ msgstr "--replacepkgs --replacefiles ɼ ÿ մϴ"
msgid "upgrade package(s) if already installed"
msgstr " ġ Ű ׷̵ մϴ"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<Ű>+"
@@ -1999,6 +1999,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr " %%triggerpostun ũƲ(scriptlet) ʽϴ"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2006,40 +2010,40 @@ msgstr ""
" Ű ٿ׷̵ մϴ (--force ɼ ÿ ɼ"
" ڵ ˴ϴ)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "Ű ġ ۼƮ(%) ǥմϴ"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"ġ ִ Ű , <丮> ġϿ ġմϴ"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<丮>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "<> <ο> ġ մϴ"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<>=<ο>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "Ű ̹ ġǾ ִ 쿡 ġմϴ"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "Ű ġ ʰ, ġǴ Ȯմϴ"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "Ű ׷̵ մϴ"
@@ -2367,7 +2371,7 @@ msgstr " Ű ȣ: %s\n"
msgid "record %u could not be read\n"
msgstr "(record) ȣ %u() ϴ\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "%s Ű ġǾ ʽϴ\n"
@@ -2377,7 +2381,7 @@ msgstr "%s Ű ġǾ ʽϴ\n"
msgid "unknown tag: \"%s\"\n"
msgstr " ± Դϴ"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: µ ߽ϴ: %s\n"
@@ -2412,52 +2416,57 @@ msgstr "%s: writeLead ߽ϴ: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature ߽ϴ: %s\n"
-#: lib/rpmchecksig.c:411
+#: lib/rpmchecksig.c:391
#, fuzzy, c-format
-msgid "%s: import failed.\n"
+msgid "%s: key %d import failed.\n"
msgstr "%s: readLead ߽ϴ\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: readLead ߽ϴ\n"
+
+#: lib/rpmchecksig.c:439
#, fuzzy, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: readLead ߽ϴ\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead ߽ϴ\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "ùٸ "
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "Ȯ"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (Ű ã :"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (Ű ŷ :"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2484,64 +2493,64 @@ msgstr "ƴϿ"
msgid "YES"
msgstr ""
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
#, fuzzy
msgid "internal support for lua scripts."
msgstr "'-' ڿ ϴ\n"
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "%s Ű ̹ ġǾ ֽϴ"
@@ -2575,47 +2584,47 @@ msgstr " :\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s() ġϴ Ű : %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s() ġ ϴ\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "%s() մϴ\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "%s() մϴ - (transfer) - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "%s Ű ġ ϴ\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "%s д ߻߽ϴ\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "%s ֽ RPM ʿ մϴ\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" Ű մϴ\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s() : %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "%s() ġմϴ\n"
@@ -2847,15 +2856,35 @@ msgstr ""
msgid "Unknown format"
msgstr " ± Դϴ"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "ġǾ "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "%s() µ : %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "%s() дµ : %s.\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "%s ̸ %s() ϴµ : %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2881,7 +2910,7 @@ msgstr " Ű ȣ: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: readLead ߽ϴ\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2928,70 +2957,80 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "%s() : %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, fuzzy, c-format
msgid "gpg exec failed (%d)\n"
msgstr "࿡ ߽ϴ\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "gpg ۼϴµ ߽ϴ\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr " ϴ\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "ũ ȿ %%_signature (spec) ֽϴ\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "ũ ȿ ݵ \"%%_gpg_name\" ؾ մϴ\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
#, fuzzy
msgid "Header SHA1 digest:"
msgstr "SHA1 (digest) ˻ ʽϴ"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr ""
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ": size(%d)+pad(%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s() ߽ϴ\n"
@@ -3403,17 +3442,17 @@ msgstr ": "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "޸ Ҵ (%u Ʈ) NULL ȯϿϴ.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr " ϴ\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "( )"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "%s spec дµ ߽ϴ\n"
@@ -3507,9 +3546,6 @@ msgstr "Ű ˻մϴ"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "%s (stat) ǥϴµ : %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "%s() µ : %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "%s ġ ֽϴ\n"
@@ -3690,9 +3726,6 @@ msgstr "Ű ˻մϴ"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: readLead ߽ϴ\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "%s() дµ : %s.\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "%2$s %1$s Ȯ(expansion) :%3$d \"%4$s\"\n"
diff --git a/po/ms.po b/po/ms.po
index a9f64e4f0..8ad23460c 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2008-06-14 00:38+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -317,31 +317,31 @@ msgstr "Sambungan Gagal"
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:784
+#: rpmqv.c:786
#, fuzzy
msgid "no arguments given"
msgstr "(tiada cadangan ejaan)"
@@ -555,7 +555,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr ""
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
@@ -580,7 +580,7 @@ msgstr "Ralat mengimport fail %s"
msgid "Glob not permitted: %s\n"
msgstr "Fail %s tidak dijumpai"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, fuzzy, c-format
msgid "File not found by glob: %s\n"
msgstr "Fail pertolongan tidak dijumpai\n"
@@ -822,12 +822,12 @@ msgstr "Sambungan Gagal"
msgid "Package check \"%s\" failed.\n"
msgstr ""
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:779
+#: build/pack.c:783
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "Hasilkan fax"
@@ -1007,37 +1007,37 @@ msgstr ""
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "mencapah selepas versi %d daripada %s"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, fuzzy, c-format
msgid "Bad package specification: %s\n"
msgstr "Fail Pakej RPM"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, fuzzy, c-format
msgid "Package already exists: %s\n"
msgstr "Fail telah wujud. Tulisganti fail '%s'?"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, fuzzy, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "&Sembunyi nombor baris"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "Clip Art tidak boleh dimuatkan"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "Clip Art tidak boleh dimuatkan"
@@ -1599,32 +1599,32 @@ msgstr ""
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "Mempuny&ai label"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "Sambungan Gagal"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "Sambungan Gagal"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "Mempuny&ai label"
@@ -1706,12 +1706,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr "Mengabaikan rpm buruk: %s"
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "Sambungan Gagal"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, fuzzy, c-format
msgid "%s: No signature available\n"
msgstr "Lekang Tandatangan OpenPGP"
@@ -1721,7 +1721,7 @@ msgstr "Lekang Tandatangan OpenPGP"
msgid "%s: headerRead failed: %s"
msgstr "Sambungan Gagal"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "Sambungan Gagal"
@@ -1899,7 +1899,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr ""
@@ -2003,46 +2003,50 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:266
+#: lib/poptI.c:270
#, fuzzy
msgid "<dir>"
msgstr "Dir Temp: "
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:269
+#: lib/poptI.c:273
#, fuzzy
msgid "<old>=<new>"
msgstr "&Tetingkap Baru"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:280
+#: lib/poptI.c:284
#, fuzzy
msgid "upgrade package(s)"
msgstr "Pelihat Pakej"
@@ -2372,7 +2376,7 @@ msgstr "Ubah jumlah lajur"
msgid "record %u could not be read\n"
msgstr "Clip Art tidak boleh dimuatkan"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "Fail %s adalah jenis tidak disokong pada masa ini"
@@ -2382,7 +2386,7 @@ msgstr "Fail %s adalah jenis tidak disokong pada masa ini"
msgid "unknown tag: \"%s\"\n"
msgstr "Fail %s adalah dari jenis tidak diketahui"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "Sambungan Gagal"
@@ -2417,55 +2421,60 @@ msgstr "Sambungan Gagal"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "Sambungan Gagal"
-#: lib/rpmchecksig.c:411
+#: lib/rpmchecksig.c:391
#, fuzzy, c-format
-msgid "%s: import failed.\n"
+msgid "%s: key %d import failed.\n"
msgstr "Sambungan Gagal"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: gagal membaca manifest: %s\n"
+
+#: lib/rpmchecksig.c:439
#, fuzzy, c-format
msgid "%s: import read failed(%d).\n"
msgstr "Gagal untuk mencari seksyen: %s"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "Sambungan Gagal"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
#, fuzzy
msgid "NOT OK"
msgstr "Tiada"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
#, fuzzy
msgid " (MISSING KEYS:"
msgstr "Kekunci Multimedia"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
#, fuzzy
msgid " (UNTRUSTED KEYS:"
msgstr "Kekunci Multimedia"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2494,63 +2503,63 @@ msgstr "Tidak"
msgid "YES"
msgstr "Ya"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr ""
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
msgid "package scriptlets can be expanded at install time."
msgstr ""
@@ -2583,47 +2592,47 @@ msgstr "Sambungan Gagal"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "Ralat - %s tidak dijumpai"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "Gagal untuk mencari seksyen: %s"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "Fail %s adalah jenis tidak disokong pada masa ini"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "Selit MathML dari fail"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "Stat pakej Mandriva Linux"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Buka Fail"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -2845,15 +2854,35 @@ msgstr "Gagal untuk mencari seksyen: %s"
msgid "Unknown format"
msgstr "Tidak Diketahui"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "Tiada"
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "Fail HTML untuk dibuka"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Fail HTML untuk dibuka"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Gagal untuk mencari seksyen: %s"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2879,7 +2908,7 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr "%s: gagal membaca manifest: %s\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
#, fuzzy
msgid "transaction"
msgstr "&Tetapan Halaman"
@@ -2927,69 +2956,79 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "Tidak dapat melaksana %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "Pelaksanaan gpg gagal (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "Digest SHA1 pengepala:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Pengepala"
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Tandatangan: TIDAK DIKETAHUI (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "Gagal"
@@ -3394,17 +3433,17 @@ msgstr ""
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr ""
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "%sV%d tandatangan DSA: %s, ID kekunci %s\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(tiada ralat)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Gagal untuk mencari seksyen: %s"
@@ -3454,10 +3493,6 @@ msgstr ""
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "Gagal untuk mencari seksyen: %s"
-#, fuzzy
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "Fail HTML untuk dibuka"
-
#~ msgid "cannot open %s index\n"
#~ msgstr "tidak dapat membuka indeks %s\n"
diff --git a/po/nb.po b/po/nb.po
index 6ea77843b..26e489dcb 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2001-06-27 12:24+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -314,32 +314,32 @@ msgstr "kjring feilet\n"
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler oppgitt for ombygging"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "ingen spec-fil oppgitt for bygging"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "ingen tar-fil oppgitt for bygging"
-#: rpmqv.c:709
+#: rpmqv.c:711
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker oppgitt for installering"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "ingen pakker oppgitt for installering"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "ingen argumenter oppgitt for sprring"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "ingen argumenter oppgitt for verifisering"
-#: rpmqv.c:784
+#: rpmqv.c:786
#, fuzzy
msgid "no arguments given"
msgstr "ingen argumenter oppgitt for sprring"
@@ -546,7 +546,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr "%s: readLead feilet\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
@@ -571,7 +571,7 @@ msgstr ""
msgid "Glob not permitted: %s\n"
msgstr "linje %d: Filnavn ikke tillatt: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -815,12 +815,12 @@ msgstr "Kjring av %s feilet (%s): %s\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Passordsjekk feilet\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -1000,37 +1000,37 @@ msgstr "linje %d: Ugyldig BuildArchitecture format: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Intern feil: Ugyldig tag %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "linje %d: Versjon kreves: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Ugyldig pakkespesifikasjon: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Pakke eksisterer allerede: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "linje %d: Ukjent tagg: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "BuildRoot kan ikke vre \"/\": %s\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "BuildRoot kan ikke vre \"/\": %s\n"
@@ -1587,32 +1587,32 @@ msgstr ""
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s lagret som %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s rmdir av %s feilet: Katalogen er ikke tom\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir av %s feilet: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s unlink av %s feilet: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s opprettet som %s\n"
@@ -1692,12 +1692,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature feilet\n"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tilgjengelig\n"
@@ -1707,7 +1707,7 @@ msgstr "%s: Ingen signatur tilgjengelig\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: readLead feilet\n"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread feilet: %s\n"
@@ -1887,7 +1887,7 @@ msgstr "forkortning for --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "oppgrader pakke(r) hvis allerede installert"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<pakkefil>+"
@@ -1992,6 +1992,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "ikke kjr %%triggerpostun skriptlets"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1999,39 +2003,39 @@ msgstr ""
"oppgrader til en gammel versjon av pakken (--force ved oppgraderinger gjr "
"dette automatisk)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "omplasser pakken til <kat>, hvis den er omplasserbar"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<kat>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "omplasser filer fra sti <gml> til <ny>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<gml>=<ny>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "reinstaller selv om pakken allerede er installert"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "ikke installer, men si ifra om det ville virke eller ikke"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "oppgrader pakke(r)"
@@ -2362,7 +2366,7 @@ msgstr "ugyldig pakkenummer: %s\n"
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "pakke %s er ikke installert\n"
@@ -2372,7 +2376,7 @@ msgstr "pakke %s er ikke installert\n"
msgid "unknown tag: \"%s\"\n"
msgstr "linje %d: Ukjent tagg: %s\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: pne feilet: %s\n"
@@ -2407,52 +2411,57 @@ msgstr "%s: writeLead feilet: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature feilet: %s\n"
-#: lib/rpmchecksig.c:411
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
+msgstr "%s: readLead feilet\n"
+
+#: lib/rpmchecksig.c:395
#, fuzzy, c-format
-msgid "%s: import failed.\n"
+msgid "%s: key %d not an armored public key.\n"
msgstr "%s: readLead feilet\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:439
#, fuzzy, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: readLead feilet\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "IKKE OK"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ""
@@ -2479,64 +2488,64 @@ msgstr "NEI"
msgid "YES"
msgstr "JA"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
#, fuzzy
msgid "internal support for lua scripts."
msgstr "- ikke stttet for strenger\n"
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "pakke %s er allerede installert"
@@ -2570,47 +2579,47 @@ msgstr "feilede avhengigheter:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "ingen pakke utlser %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Henter %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "hopper over %s - overfring feilet - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, 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:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" spesifiserer flere pakker\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke pne %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
@@ -2832,15 +2841,35 @@ msgstr "%s: Fwrite feilet: %s\n"
msgid "Unknown format"
msgstr "Ukjent filtype"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "ikke installert"
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "klarte ikke pne %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "kunne ikke opprette %s: %s\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Feil under endring av navn fra %s til %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2866,7 +2895,7 @@ msgstr "ugyldig pakkenummer: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: readLead feilet\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2913,70 +2942,80 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Kunne ikke kjre %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, fuzzy, c-format
msgid "gpg exec failed (%d)\n"
msgstr "kjring feilet\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
#, fuzzy
msgid "Header SHA1 digest:"
msgstr "ikke verifiser header SHA1 digest"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr ""
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s feilet\n"
@@ -3388,16 +3427,16 @@ msgstr "advarsel: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr ""
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "hopp over MD5-signaturer"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
msgid "(none)"
msgstr ""
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Feil under lesing av spec-fil fra %s\n"
@@ -3437,9 +3476,6 @@ msgstr "verifiser pakkesignatur"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "feil under kjring av stat p %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "klarte ikke pne %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "fil %s er p en ukjent enhet\n"
@@ -3514,9 +3550,6 @@ msgstr "verifiser pakkesignatur"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: readLead feilet\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "kunne ikke opprette %s: %s\n"
-
#~ msgid "Cannot expand %s\n"
#~ msgstr "Kan ikke utvide %s\n"
diff --git a/po/nl.po b/po/nl.po
index 4f95c78fa..bced129b6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2008-09-03 22:17+0200\n"
"Last-Translator: Peter van Egdom <p.van.egdom@gmail.com>\n"
"Language-Team: Dutch <fedora-trans-list@redhat.com>\n"
@@ -312,31 +312,31 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr ""
@@ -539,7 +539,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr ""
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
@@ -564,7 +564,7 @@ msgstr ""
msgid "Glob not permitted: %s\n"
msgstr "Glob niet toegestaan: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -805,12 +805,12 @@ msgstr ""
msgid "Package check \"%s\" failed.\n"
msgstr ""
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -990,37 +990,37 @@ msgstr ""
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr ""
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1565,32 +1565,32 @@ msgstr ""
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -1670,12 +1670,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr ""
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr ""
@@ -1685,7 +1685,7 @@ msgstr ""
msgid "%s: headerRead failed: %s"
msgstr ""
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1855,7 +1855,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<pakketbestand>+"
@@ -1956,44 +1956,48 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr ""
@@ -2306,7 +2310,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2316,7 +2320,7 @@ msgstr ""
msgid "unknown tag: \"%s\"\n"
msgstr ""
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
@@ -2350,52 +2354,57 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:411
+#: lib/rpmchecksig.c:391
#, c-format
-msgid "%s: import failed.\n"
+msgid "%s: key %d import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr ""
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "NIET OK"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (ONTBREKENDE SLEUTELS:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2422,63 +2431,63 @@ msgstr "NEE "
msgid "YES"
msgstr "JA"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr ""
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "pakket %s is reeds geïnstalleerd"
@@ -2511,47 +2520,47 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -2770,15 +2779,35 @@ msgstr ""
msgid "Unknown format"
msgstr "Onbekend"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "(geïnstalleerd) "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "bestand %s: %s\n"
+
+#: lib/rpmte.c:869
+#, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr ""
+
+#: lib/rpmte.c:896
+#, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr ""
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2804,7 +2833,7 @@ msgstr "ontbrekende ')' in pakketlabel: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2851,69 +2880,79 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr ""
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "gpg uitvoeren mislukt (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr ""
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr ""
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr " mislukt - "
@@ -3317,17 +3356,17 @@ msgstr "waarschuwing: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr ""
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr ""
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(geen fout)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, c-format
msgid "Failed to register fork handler: %m\n"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 78af753f0..948eaa48a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2010-06-03 20:45+0200\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
@@ -328,31 +328,31 @@ msgstr "wykonanie nie powiodło się\n"
msgid "no packages files given for rebuild"
msgstr "nie podano nazw pakietów do przebudowania"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "nie podano nazw plików spec do zbudowania"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "nie podano plików tar do zbudowania"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "nie podano pakietów do usunięcia"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "nie podano pakietów do zainstalowania"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "nie podano parametrów dla zapytania"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "nie podano parametrów dla sprawdzenia"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "nie podano parametrów"
@@ -558,7 +558,7 @@ msgstr "%s: nie można wczytać nieznanego znacznika (%d).\n"
msgid "%s: public key read failed.\n"
msgstr "%s: odczytanie klucza publicznego nie powiodło się.\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: nie jest opakowanym kluczem publicznym.\n"
@@ -583,7 +583,7 @@ msgstr "Plik musi zaczynać się od \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Wyrażenie regularne jest niedozwolone: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Nie odnaleziono pliku przez wyrażenie regularne: %s\n"
@@ -826,12 +826,12 @@ msgstr "Wykonanie \"%s\" nie powiodło się.\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Sprawdzenie pakietu \"%s\" nie powiodło się.\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Nie można utworzyć wyjściowej nazwy pliku dla pakietu %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "nie można utworzyć %s: %s\n"
@@ -1011,37 +1011,37 @@ msgstr "wiersz %d: błędny format BuildArchitecture: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "wiersz %d: obsługiwane są tylko podpakiety noarch: %s\n"
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Wewnętrzny błąd: fałszywy znacznik %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "wiersz %d: %s jest przestarzałe: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Błędna specyfikacja pakietu: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Pakiet już istnieje: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "wiersz %d: nieznany znacznik: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} nie może być puste\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} nie może być \"/\"\n"
@@ -1590,32 +1590,32 @@ msgstr "użytkownik %s nie istnieje - używanie roota\n"
msgid "group %s does not exist - using root\n"
msgstr "grupa %s nie istnieje - używanie roota\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "nie odnaleziono pliku archiwum %s na liście plików w nagłówku\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s zapisano jako %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "wykonanie %s rmdir na %s nie powiodło się: katalog nie jest pusty\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "wykonanie %s rmdir na %s nie powiodło się: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "wykonanie %s unlink na %s nie powiodło się: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s utworzono jako %s\n"
@@ -1695,12 +1695,12 @@ msgstr "hdr blob(%zd): BŁĘDNY, read zwróciło %d\n"
msgid "hdr load: BAD\n"
msgstr "hdr load: BŁĘDNY\n"
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature nie powiodło się: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: podpis jest niedostępny\n"
@@ -1710,7 +1710,7 @@ msgstr "%s: podpis jest niedostępny\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead nie powiodło się: %s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread nie powiodło się: %s\n"
@@ -1885,7 +1885,7 @@ msgstr "skrócona wersja --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "zaktualizowanie pakietów, jeśli są już zainstalowane"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<plik_pakietu>+"
@@ -1986,6 +1986,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "bez wykonania żadnych skryptów %%triggerpostun"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1993,39 +1997,39 @@ msgstr ""
"zaktualizowanie do poprzedniej wersji pakietu (--force podczas "
"aktualizowania robi to automatycznie)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "wyświetlenie stanu instalacji pakietu w procentach"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "przesunięcie pakietu do <katalogu>, jeśli jest przesuwalny"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<katalog>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "przesunięcie plików z <poprzedniej> ścieżki do <nowej>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<poprzednia>=<nowa>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "zignorowanie konfliktów plików między pakietami"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "zainstalowanie ponownie, jeśli pakiet jest już zainstalowany"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "bez instalacji, podanie tylko czy instalacja zadziała czy nie"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "zaktualizowanie pakietów"
@@ -2338,7 +2342,7 @@ msgstr "nieprawidłowy numer pakietu: %s\n"
msgid "record %u could not be read\n"
msgstr "nie można odczytać wpisu %u\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
@@ -2348,7 +2352,7 @@ msgstr "pakiet %s nie jest zainstalowany\n"
msgid "unknown tag: \"%s\"\n"
msgstr "nieznany znacznik: \"%s\"\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otwarcie nie powiodło się: %s\n"
@@ -2382,53 +2386,58 @@ msgstr "%s: writeLead nie powiodło się: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature nie powiodło się: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: zaimportowanie nie powiodło się.\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: nie jest opakowanym kluczem publicznym.\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: zaimportowanie read nie powiodło się(%d).\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead nie powiodło się\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
"%s: nie można odczytać niezmiennego regionu nagłówka. Uszkodzony pakiet?\n"
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr "pomijanie pakietu %s z podpisem V%u, którego nie można sprawdzić\n"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "NIE DOBRZE"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (BRAK KLUCZY:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (NIEZAUFANE KLUCZE:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2455,66 +2464,66 @@ msgstr "NIE "
msgid "YES"
msgstr "TAK"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr "Zależności PreReq:, Provides: i Obsoletes: obsługują wersje."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
"nazwy plików przechowano jako krotka (dirName,baseName,dirIndex), a nie jako "
"ścieżki."
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "dane pakietu mogą zostać skompresowane używając bzip2."
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr "dane pakietu mogą zostać skompresowane używając xz."
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr "dane pakietu mogą zostać skompresowane używając lzma."
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "pliki danych pakietu posiadają przedrostek \"./\"."
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr "pakiet nazwa-wersja-wydanie nie jest domyślnie dostarczany."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr "znaczniki nagłówka są zawsze porządkowane po wczytaniu."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr "interpreter skryptów może używać parametrów z nagłówka."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr "plik twardego dowiązania może zostać zainstalowany bez ukończenia."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
"skrypty pakietu mogą odwoływać się do bazy danych RPM podczas instalowania."
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "wewnętrzna obsługa skryptów Lua."
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr "algorytm skrótu pliku jest konfigurowalny dla każdego pakietu osobno"
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr "obsługa możliwości plików POSIX.1e"
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
msgid "package scriptlets can be expanded at install time."
msgstr "skrypty pakietu mogą być rozszerzane w czasie instalacji."
@@ -2546,47 +2555,47 @@ msgstr "Niespełnione zależności:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: nie jest pakietem RPM (ani manifestem pakietu): %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie może zostać zainstalowany\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Pobieranie %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "pomijanie %s - przesłanie nie powiodło się\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "błąd podczas odczytywania z pliku %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "plik %s wymaga nowszej wersji oprogramowania RPM\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" podaje wiele pakietów:\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nie można otworzyć %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Instalowanie %s\n"
@@ -2803,14 +2812,34 @@ msgstr "Skrypt %s nie powiódł się, stan wyjścia %d\n"
msgid "Unknown format"
msgstr "Nieznany format"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
msgid "install"
msgstr "instalacja"
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr "usunięcie"
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "Nie można otworzyć %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Zmiana nazwy %s na %s nie powiodła się: %m\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Zmiana nazwy %s na %s nie powiodła się: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2836,7 +2865,7 @@ msgstr "brak \")\" w etykiecie pakietu: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: odczytanie klucza publicznego nie powiodło się.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr "transakcji"
@@ -2883,69 +2912,79 @@ msgstr "sigh wyrównanie(%zd): BŁĘDNE, odczytano %zd bajtów\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "sigh rozmiar podpisu(%zd): BŁĘDNY, fstat(2) nie powiodło się\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr "Nie można utworzyć potoku do podpisania: %m"
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "Nie można wykonać %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "wykonanie gpg nie powiodło się (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "zapisanie podpisu przez gpg nie powiodło się\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "nie można odczytać podpisu\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr "Nie można odczytać niezmiennego regionu nagłówka. Uszkodzony pakiet?\n"
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Nieprawidłowa specyfikacja %%_signature w pliku makr\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Należy ustawić \"%%_gpg_name\" w pliku makr\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr "Skrót MD5:"
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "Skrót SHA1 nagłówka:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Nagłówek "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "Sprawdzenie podpisu: BŁĘDNE PARAMETRY\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Podpis: NIEZNANY (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr "pominięto"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "failed"
msgstr "nie powiodło się"
@@ -3352,16 +3391,16 @@ msgstr "ostrzeżenie: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "przydzielenie pamięci (%u bajtów) zwróciło NULL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "V%d %s/%s %s, identyfikator klucza %s"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
msgid "(none)"
msgstr "(brak)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Zarejestrowanie obsługi rozdzielenia nie powiodło się: %m\n"
diff --git a/po/pt.po b/po/pt.po
index 17340bd71..1204c8343 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2002-02-14 10:51+0000\n"
"Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
"Language-Team: pt <morais@kde.org\n"
@@ -324,31 +324,31 @@ msgstr "o exec falhou\n"
msgid "no packages files given for rebuild"
msgstr "não foram indicados pacotes para a reconstrução"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "não foram indicados ficheiros spec para a criação"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "não foram indicados ficheiros tar para a criação"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "não foram indicados pacotes para apagar"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "não foram indicados pacotes para instalar"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "não foram indicados argumentos para a pesquisa"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "não foram indicados argumentos para a verificação"
-#: rpmqv.c:784
+#: rpmqv.c:786
#, fuzzy
msgid "no arguments given"
msgstr "não foram indicados argumentos para a pesquisa"
@@ -555,7 +555,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr ":%s: o readLead falhou\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
@@ -580,7 +580,7 @@ msgstr "O ficheiro precisa de começar por \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob não permitido: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Ficheiro não encontrado pelo glob: %s\n"
@@ -823,12 +823,12 @@ msgstr "A execução de %s falhou (%s): %s\n"
msgid "Package check \"%s\" failed.\n"
msgstr "A verificação da palavra-chave falhou\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Não consigo gerar o ficheiro de saída para o pacote %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "não consigo criar o %s: %s\n"
@@ -1008,37 +1008,37 @@ msgstr "linha %d: Formato da BuildArchitecture inválido: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Erro interno: Opção esquisita %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "linha %d: Necessária a versão: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Descrição do pacote inválida: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "O pacote já existe: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "linha %d: Opção desconhecida: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "O BuildRoot não pode ser o \"/\": %s\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "O BuildRoot não pode ser o \"/\": %s\n"
@@ -1602,34 +1602,34 @@ msgstr "o utilizador %s não existe - a usar o root\n"
msgid "group %s does not exist - using root\n"
msgstr "o grupo %s não existe - a usar o root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
"o ficheiro de arquivo %s não foi encontrado na lista de ficheiros do "
"cabeçalho\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s gravado como %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s rmdir de %s falhou: Directoria não está vazia\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir de %s falhou: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s unlink de %s falhou: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s criado como %s\n"
@@ -1709,12 +1709,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: o rpmReadSignature falhou\n"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Nenhuma assinatura disponível\n"
@@ -1724,7 +1724,7 @@ msgstr "%s: Nenhuma assinatura disponível\n"
msgid "%s: headerRead failed: %s"
msgstr ":%s: o readLead falhou\n"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: O fread falhou: %s\n"
@@ -1907,7 +1907,7 @@ msgstr "abreviatura para --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "actualizar o pacote(s) se já estiver instalado"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<pacote>+"
@@ -2013,6 +2013,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerpostun"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2020,39 +2024,39 @@ msgstr ""
"actualiza para um versão antiga do pacote (o --force faz isto "
"automaticamente)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "mostra percentagens enquanto o pacote instala"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "muda o pacote para <dir>, se for possível"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "muda os ficheiros de <velho> para <novo>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<velho>=<novo>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "reinstalar se o pacote já estiver presente"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "não instala, mas indica se iria funcionar ou não"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "actualizar pacote(s)"
@@ -2381,7 +2385,7 @@ msgstr "número de pacote inválido: %s\n"
msgid "record %u could not be read\n"
msgstr "o registo %u não pôde ser lido\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "o pacote %s não está instalado\n"
@@ -2391,7 +2395,7 @@ msgstr "o pacote %s não está instalado\n"
msgid "unknown tag: \"%s\"\n"
msgstr "opção desconhecida"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: o acesso falhou: %s\n"
@@ -2426,52 +2430,57 @@ msgstr "%s: o writeLead falhou: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: o rpmWriteSignature falhou: %s\n"
-#: lib/rpmchecksig.c:411
+#: lib/rpmchecksig.c:391
#, fuzzy, c-format
-msgid "%s: import failed.\n"
+msgid "%s: key %d import failed.\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr ":%s: o readLead falhou\n"
+
+#: lib/rpmchecksig.c:439
#, fuzzy, c-format
msgid "%s: import read failed(%d).\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "NÃO-OK"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (FALTAM AS CHAVES:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (CHAVES SUSPEITAS:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2498,64 +2507,64 @@ msgstr "NÃO"
msgid "YES"
msgstr "SIM"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
#, fuzzy
msgid "internal support for lua scripts."
msgstr "- não suportado em cadeias de caracteres\n"
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "o pacote %s já está instalado"
@@ -2589,47 +2598,47 @@ msgstr "dependências falhadas:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "nenhum pacote coincide com %s: %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "o %s não pode ser instalado\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "A obter o %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "a ignorar o %s - a transferência falhou - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "o pacote %s não pode ser mudado de sítio\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "erro ao ler do ficheiros %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "o %s precisa duma versão mais recente do RPM\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "o \"%s\" especifica vários pacotes\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "não consigo aceder ao %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "A instalar o %s\n"
@@ -2859,15 +2868,35 @@ msgstr ""
msgid "Unknown format"
msgstr "opção desconhecida"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "não instalado "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "falhei ao aceder ao %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Não consegui ler o %s: %s.\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Não consegui mudar o nome de %s para %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2893,7 +2922,7 @@ msgstr "número de pacote inválido: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2940,70 +2969,80 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "Não consegui executar %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, fuzzy, c-format
msgid "gpg exec failed (%d)\n"
msgstr "o exec falhou\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "o gpg não conseguiu gravar a assinatura\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "incapaz de ler a assinatura\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "'Spec' %%_signature inválido no ficheiro de macros\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Precisa definir o \"%%_gpg_name\" no seu ficheiro de macros\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
#, fuzzy
msgid "Header SHA1 digest:"
msgstr "não verificar o SHA1 do cabeçalho"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr ""
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Assinatura: tamanho(%d)+pad(%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "O %s falhou\n"
@@ -3411,17 +3450,17 @@ msgstr "aviso: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "a alocação de memória (%u bytes) devolveu NULL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "Sem assinatura\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(nenhum erro)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Não consegui ler o ficheiro spec do %s\n"
@@ -3510,9 +3549,6 @@ msgstr "verificar a assinatura do pacote"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "Não consegui analisar o %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "falhei ao aceder ao %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "o ficheiro %s está num dispositivo desconhecido\n"
@@ -3691,9 +3727,6 @@ msgstr "verificar a assinatura do pacote"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr ":%s: o readLead falhou\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "Não consegui ler o %s: %s.\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "a expansão do %s falhou em %s:%d \"%s\"\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 20cf7d1eb..5c5ca6cb4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2010-04-27 13:28-0300\n"
"Last-Translator: Taylon Silmer <taylonsilva@gmail.com>\n"
"Language-Team: Brazilian Portuguese <trans-pt_br@lists.fedoraproject.org>\n"
@@ -349,31 +349,31 @@ msgstr "a execução falhou\n"
msgid "no packages files given for rebuild"
msgstr "nenhum pacote foi passado para reconstrução"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "nenhum arquivo spec foi passado para construção"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "não foram passados arquivos tar para construção"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "nenhum pacote foi passado para remoção"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "nenhum pacote foi passado para instalação"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "nenhum argumento foi passado para consulta"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "nenhum argumento foi passado para verificação"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "nenhum argumento foi passado"
@@ -591,7 +591,7 @@ msgstr "%s: não foi possível carregar a etiqueta desconhecida (%d).\n"
msgid "%s: public key read failed.\n"
msgstr "%s: falha ao ler a chave pública.\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: não é uma chave pública blindada.\n"
@@ -618,7 +618,7 @@ msgstr "O arquivo precisa da \"/\" inicial: %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob não permitido: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "O arquivo não foi encontrado pelo glob: %s\n"
@@ -890,14 +890,14 @@ msgstr "A execução de \"%s\" falhou.\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Falha na verificação \"%s\" do pacote.\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
"Não foi possível gerar o nome de arquivo de saída para o pacote %s: %s\n"
# , c-format
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "Não foi possível criar %s: %s\n"
@@ -1095,39 +1095,39 @@ msgstr "linha %d: formato BuildArchitecture inválido: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "linha %d: Somente subpacotes noarch são suportados: %s\n"
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Erro interno: tag %d falsa\n"
# , c-format
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "linha %d: %s é obsoleto: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Especificação do pacote inválida: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "O pacote já existe: %s\n"
# , c-format
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "linha %d: Etiqueta desconhecida: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} não pode ser vazio\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} não pode ser \"/\"\n"
@@ -1709,35 +1709,35 @@ msgstr "o usuário %s não existe - usando o root\n"
msgid "group %s does not exist - using root\n"
msgstr "o grupo %s não existe - usando o root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "o pacote %s não foi encontrado na lista do arquivo de cabeçalho\n"
# , c-format
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s salvo como %s\n"
# , c-format
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s rmdir de %s falhou: O diretório não está vazio\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir de %s falhou: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s unlink de %s falhou: %s\n"
# , c-format
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s criado como %s\n"
@@ -1820,12 +1820,12 @@ msgid "hdr load: BAD\n"
msgstr "carregamento hdr: INVÁLIDO\n"
# , c-format
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature falhou: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Nenhuma assinatura disponível\n"
@@ -1837,7 +1837,7 @@ msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead falhou: %s"
# , c-format
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread falhou: %s\n"
@@ -2011,7 +2011,7 @@ msgstr "atalho para --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "atualizar pacote(s) se já estiver(em) instalado(s)"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<arquivo_do_pacote>+"
@@ -2112,6 +2112,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "não executar nenhum scriptlet %%triggerpostun"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2119,39 +2123,39 @@ msgstr ""
"atualizar para uma versão mais antiga do pacote (--force em atualizações faz "
"isso automaticamente)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "exibir porcentagens na medida em que o pacote vai sendo instalado"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "realocar o pacote para <dir>, se for realocável"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "realocar arquivos do caminho <antigo> para o <novo>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<antigo>=<novo>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "ignorar conflitos de arquivos entre pacotes"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "reinstalar se o pacote já estiver presente"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "não instalar, mas dizer se a instalação funcionaria ou não"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "atualizar pacote(s)"
@@ -2466,7 +2470,7 @@ msgstr "número de pacote inválido: %s\n"
msgid "record %u could not be read\n"
msgstr "o registro %u não pôde ser lido\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "o pacote %s não está instalado\n"
@@ -2478,7 +2482,7 @@ msgid "unknown tag: \"%s\"\n"
msgstr "etiqueta desconhecida: \"%s\"\n"
# , c-format
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: falha ao abrir: %s\n"
@@ -2516,55 +2520,60 @@ msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature falhou: %s\n"
# , c-format
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: a importação falhou.\n"
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: não é uma chave pública blindada.\n"
+
# , c-format
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: leitura de importação falhou (%d).\n"
# , c-format
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead falhou\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
"%s: A região de cabeçalho imutável não pôde ser lida. Pacote corrompido?\n"
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr "ignorando pacote %s com assinatura V%u não verificável\n"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "Não está OK"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (CHAVES FALTANDO:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (CHAVES NÃO CONFIÁVEIS:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2594,71 +2603,71 @@ msgstr "NÃO "
msgid "YES"
msgstr "SIM"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
"PreReq:, Capacidades: e Obsoletos: as dependências suportam as versões."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
"Nome(s) de arquivo(s) armazenados como tuplas (dirName,baseName,dirIndex), "
"não como um caminho."
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "a carga útil do pacote pode ser compactada utilizando bzip2."
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr "a carga útil do pacote pode ser compactada utilizando o xz."
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr "a carga útil do pacote pode ser compactada utilizando lzma."
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "o(s) arquivo(s) da carga útil do pacote tem o prefixo \"./\"."
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr "o nome-versão-lançamento do pacote não está fornecido implicitamente."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
"As etiquetas de cabeçalho sempre são classificadas após serem carregadas."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr "o interpretador do scriptlet pode usar argumentos do cabeçalho."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
"um conjunto de arquivos de ligação absoluta podem ser instalados sem estarem "
"completos."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
"scriptlets de pacotes podem acessar o banco de dados rpm durante a "
"instalação."
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "suporte interno para scripts lua."
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr "o algoritmo digest é configurável por pacote"
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr "suporte para as capacidades de arquivo do POSIX.1e"
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
msgid "package scriptlets can be expanded at install time."
msgstr "scriptlets de pacotes podem ser expandidos durante a instalação."
@@ -2690,48 +2699,48 @@ msgstr "Dependências não satisfeitas:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: não é um pacote rpm (ou um manifesto de pacote): %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s não pode ser instalado\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Obtendo %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "ignorando %s - a transferência falhou\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "o pacote %s não é realocável\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "erro ao ler o arquivo %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "o arquivo %s requer uma versão mais recente do RPM\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" especifica múltiplos pacotes:\n"
# , c-format
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "Não foi possível abrir %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Instalando %s\n"
@@ -2957,14 +2966,37 @@ msgstr "o scriptlet %s falhou, status de saída %d\n"
msgid "Unknown format"
msgstr "Formato desconhecido"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
msgid "install"
msgstr "instalar"
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr "apagar"
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+# , c-format
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "falha ao abrir %s: %s\n"
+
+# , c-format
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Falha ao ler %s: %s.\n"
+
+# , c-format
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Falha ao renomear %s para %s: %m\n"
+
# , c-format
#: lib/rpmts.c:91
#, c-format
@@ -2992,7 +3024,7 @@ msgstr "\")\" faltando no rótulo do pacote: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: falha na leitura da chave pública.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
#, fuzzy
msgid "transaction"
msgstr "criar conjunto de transações"
@@ -3040,70 +3072,80 @@ msgstr "sigh pad(%zd): INVÁLIDO, %zd bytes lidos\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "sigh sigSize(%zd): INVÁLIDO, fstat(2) falhou\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr "Não foi possível criar um canal para assinar: %m"
# , c-format
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "Não foi possível executar %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "a execução do gpg falhou (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "o gpg falhou ao gravar a assinatura\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "não foi possível ler a assinatura\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr "A região de cabeçalho imutável não pôde ser lida. Pacote corrompido?\n"
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Spec %%_signature inválido no arquivo macro\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Você deve definir o \"%%_gpg_name\" no seu arquivo de macro\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr "Digest MD5:"
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "Digest do cabeçalho SHA1:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Cabeçalho "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "Verificação de assinatura: PARÂMETROS INVÁLIDOS\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Assinatura: DESCONHECIDA (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr "ignorado"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "failed"
msgstr "falhou"
@@ -3528,17 +3570,17 @@ msgstr "aviso: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "a alocação de memória (%u bytes) retornou NULL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "V%d %s/%s %s, ID da chave %s"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
msgid "(none)"
msgstr "(nada)"
# , c-format
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Falha ao registrar o manipulador do fork: %m\n"
@@ -3665,10 +3707,6 @@ msgstr "não verificar a assinatura do cabeçalho+carga útil"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "falha ao iniciar %s: %s\n"
-# , c-format
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "falha ao abrir %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "o arquivo %s está em um dispositivo desconhecido\n"
@@ -3880,10 +3918,6 @@ msgstr "não verificar a assinatura do cabeçalho+carga útil"
#~ msgstr "%s: headerGetEntry falhou\n"
# , c-format
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "Falha ao ler %s: %s.\n"
-
-# , c-format
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "a expansão do %s falhou em %s:%d \"%s\"\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index 7ab1daac8..0f40f3722 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\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"
@@ -312,31 +312,31 @@ msgstr ""
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr ""
@@ -539,7 +539,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr ""
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
@@ -564,7 +564,7 @@ msgstr ""
msgid "Glob not permitted: %s\n"
msgstr ""
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -805,12 +805,12 @@ msgstr ""
msgid "Package check \"%s\" failed.\n"
msgstr ""
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr ""
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr ""
@@ -990,37 +990,37 @@ msgstr ""
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr ""
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1560,32 +1560,32 @@ msgstr ""
msgid "group %s does not exist - using root\n"
msgstr ""
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr ""
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr ""
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr ""
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr ""
@@ -1665,12 +1665,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr ""
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr ""
@@ -1680,7 +1680,7 @@ msgstr ""
msgid "%s: headerRead failed: %s"
msgstr ""
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1850,7 +1850,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr ""
@@ -1951,44 +1951,48 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr ""
@@ -2301,7 +2305,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2311,7 +2315,7 @@ msgstr ""
msgid "unknown tag: \"%s\"\n"
msgstr ""
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
@@ -2345,52 +2349,57 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:411
+#: lib/rpmchecksig.c:391
#, c-format
-msgid "%s: import failed.\n"
+msgid "%s: key %d import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr ""
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr ""
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ""
@@ -2417,63 +2426,63 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr ""
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
msgid "package scriptlets can be expanded at install time."
msgstr ""
@@ -2505,47 +2514,47 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -2762,14 +2771,34 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
msgid "install"
msgstr ""
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, c-format
+msgid "Failed to open %s: %s\n"
+msgstr ""
+
+#: lib/rpmte.c:869
+#, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr ""
+
+#: lib/rpmte.c:896
+#, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr ""
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2795,7 +2824,7 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2842,69 +2871,79 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr ""
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr ""
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr ""
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr ""
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "failed"
msgstr ""
@@ -3307,16 +3346,16 @@ msgstr ""
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr ""
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr ""
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
msgid "(none)"
msgstr ""
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, c-format
msgid "Failed to register fork handler: %m\n"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 950d1f74d..cd1ac3952 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2010-04-02 21:55+0800\n"
"Last-Translator: Misha Shnurapet <zayzayats@yandex.ru>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -325,31 +325,31 @@ msgstr " \n"
msgid "no packages files given for rebuild"
msgstr " "
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr " "
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr " tar- "
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr " "
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr " "
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr " "
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr " "
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr " "
@@ -555,7 +555,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr "%s: .\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: .\n"
@@ -580,7 +580,7 @@ msgstr " \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob : %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr " : %s\n"
@@ -823,12 +823,12 @@ msgstr " %s (%s): %s\n"
msgid "Package check \"%s\" failed.\n"
msgstr " \n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr " %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr " %s: %s\n"
@@ -1008,37 +1008,37 @@ msgstr " %d: BuildArchitecture: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr " : %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr " %d: : %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr " : %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr " : %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr " %d: : %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "BuildRoot \"/\": %s\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "BuildRoot \"/\": %s\n"
@@ -1602,32 +1602,32 @@ msgstr " %s - root\n"
msgid "group %s does not exist - using root\n"
msgstr " %s - root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr " %s \n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s %s: \n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s %s: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s %s: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s %s\n"
@@ -1707,12 +1707,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature\n"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: \n"
@@ -1722,7 +1722,7 @@ msgstr "%s: \n"
msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead\n"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread: %s\n"
@@ -1899,7 +1899,7 @@ msgstr " --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr " () "
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "< >+"
@@ -2003,6 +2003,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr " %%triggerpostun "
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2010,39 +2014,39 @@ msgstr ""
" (--force "
")"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr " "
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr " <>, "
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr " <old> <new>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr ", "
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr " , , "
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr " ()"
@@ -2360,7 +2364,7 @@ msgstr " : %s\n"
msgid "record %u could not be read\n"
msgstr " %u\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr " %s \n"
@@ -2370,7 +2374,7 @@ msgstr " %s \n"
msgid "unknown tag: \"%s\"\n"
msgstr " "
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: : %s\n"
@@ -2405,52 +2409,57 @@ msgstr "%s: writeLead: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: .\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: .\n"
+
+#: lib/rpmchecksig.c:439
#, fuzzy, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: .\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr " "
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr ""
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " ( :"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " ( :"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2477,67 +2486,67 @@ msgstr "T"
msgid "YES"
msgstr ""
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr "PreReq:, Provides:, Obsoletes: ."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr " () (dirName,baseName,dirIndex)."
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
#, fuzzy
msgid "package payload can be compressed using bzip2."
msgstr " bzip2"
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
#, fuzzy
msgid "package payload can be compressed using xz."
msgstr " bzip2"
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
#, fuzzy
msgid "package payload can be compressed using lzma."
msgstr " bzip2"
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr " \"./\" () ."
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr "-- ."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr " ."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr " ."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr " ."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
#, fuzzy
msgid "internal support for lua scripts."
msgstr "- \n"
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr " %s "
@@ -2570,47 +2579,47 @@ msgstr " :\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: ( ) rpm : %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s \n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr " %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "%s - - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr " %s - \n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr " %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr " %s RPM\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" \n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr " %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr " %s\n"
@@ -2832,15 +2841,35 @@ msgstr "%s(%s-%s-%s) , %d\n"
msgid "Unknown format"
msgstr " "
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "()"
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr " %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr " %s: %s.\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr " %s %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2866,7 +2895,7 @@ msgstr " : %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: .\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2913,71 +2942,81 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr " %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, fuzzy, c-format
msgid "gpg exec failed (%d)\n"
msgstr " \n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr " gpg \n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr " \n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr " %%_signature \n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr " \"%%_gpg_name\" \n"
-#: lib/signature.c:741
+#: lib/signature.c:764
#, fuzzy
msgid "MD5 digest:"
msgstr " MD5:"
-#: lib/signature.c:780
+#: lib/signature.c:803
#, fuzzy
msgid "Header SHA1 digest:"
msgstr " SHA1 :"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr " "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr " : \n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr ": (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s \n"
@@ -3388,17 +3427,17 @@ msgstr ": "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "memory alloc (%u bytes) returned NULL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr " DSA V3: "
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "( )"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr " %s\n"
@@ -3494,9 +3533,6 @@ msgstr " "
#~ msgid "failed to stat %s: %s\n"
#~ msgstr " %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr " %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr " %s - \n"
@@ -3683,9 +3719,6 @@ msgstr " "
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: headerGetEntry\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr " %s: %s.\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr " %s %s:%d \"%s\"\n"
diff --git a/po/sk.po b/po/sk.po
index 99fc9b64c..3d31d84ac 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\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"
@@ -323,32 +323,32 @@ msgstr "vykonanie zlyhalo\n"
msgid "no packages files given for rebuild"
msgstr "neboli zadan iadne balky pre znovuzostavenie"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "neboli zadan iadne spec-sbory pre zostavenie"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "neboli zadan iadne tar-sbory pre zostavenie"
-#: rpmqv.c:709
+#: rpmqv.c:711
#, fuzzy
msgid "no packages given for erase"
msgstr "neboli zadan iadne balky pre intalciu"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "neboli zadan iadne balky pre intalciu"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "neboli zadan iadne argumenty pre otzku"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "neboli zadan iadne argumenty pre overenie"
-#: rpmqv.c:784
+#: rpmqv.c:786
#, fuzzy
msgid "no arguments given"
msgstr "neboli zadan iadne argumenty pre otzku"
@@ -565,7 +565,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr "%s: readLead zlyhalo\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
@@ -590,7 +590,7 @@ msgstr "Sbor potrebuje na zaiatku \"/\": %s"
msgid "Glob not permitted: %s\n"
msgstr "riadok %d: V %s s vyadovan verzie: %s"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, fuzzy, c-format
msgid "File not found by glob: %s\n"
msgstr "Sbor nebol njden: %s"
@@ -835,12 +835,12 @@ msgstr "Vykonanie %s zlyhalo (%s)"
msgid "Package check \"%s\" failed.\n"
msgstr "Kontrola hesla zlyhala\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Nie je mon vytvori meno vstupnho sboru pre balk %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, fuzzy, c-format
msgid "cannot create %s: %s\n"
msgstr "nie je mon zapsa do %s: "
@@ -1020,37 +1020,37 @@ msgstr "riadok %d: Chybn formt BuildArchitecture: %s"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, fuzzy, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Intern chyba: udn popis %d "
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "riadok %d: V %s s vyadovan verzie: %s"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, fuzzy, c-format
msgid "Bad package specification: %s\n"
msgstr "Chybn pecifikcia balka: %s"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, fuzzy, c-format
msgid "Package already exists: %s\n"
msgstr "Balk u existuje: %s"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, fuzzy, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "riadok %d: Neznmy popis: %s"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "riadok %d: BuildRoot neme by \"/\": %s"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "riadok %d: BuildRoot neme by \"/\": %s"
@@ -1623,32 +1623,32 @@ msgstr "pouvate %s neexistuje - pouije sa root"
msgid "group %s does not exist - using root\n"
msgstr "skupina %s neexistuje - pouije sa root"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "varovanie: %s uchovan ako %s"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "nie je mon odstrni %s - adresr nie je przdny"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "rmdir %s zlyhalo: %s"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "otvorenie %s zlyhalo\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "varovanie: %s vytvoren ako %s"
@@ -1728,12 +1728,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis nie je k dispozcii\n"
@@ -1743,7 +1743,7 @@ msgstr "%s: Podpis nie je k dispozcii\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: readLead zlyhalo\n"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
@@ -1929,7 +1929,7 @@ msgstr "skratka pre --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "balk %s nie je naintalovan\n"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <sbor_balku>+"
@@ -2036,6 +2036,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nevykona iadne intalan skripty"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2043,41 +2047,41 @@ msgstr ""
"aktualizova na stariu verziu balka (--force to pri aktualizcii urob "
"automaticky)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "vypisova percent poas intalcie balka"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "presun balk do <adresra>, pokia to balk povouje"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:268
+#: lib/poptI.c:272
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "presun sbory zo <starej_cesty> do <novej_cesty>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <star_cesta>=<nov_cesta>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "preintalova, pokia u balk existuje"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "neintalova, ale oznmi, i by to bolo mon"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <sbor_balka>"
@@ -2430,7 +2434,7 @@ msgstr "chybn slo balku: %s\n"
msgid "record %u could not be read\n"
msgstr "zznam %d nie je mon preta\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "balk %s nie je naintalovan\n"
@@ -2440,7 +2444,7 @@ msgstr "balk %s nie je naintalovan\n"
msgid "unknown tag: \"%s\"\n"
msgstr "neznmy tag"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otvorenie zlyhalo\n"
@@ -2475,52 +2479,57 @@ msgstr "%s: readLead zlyhalo\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/rpmchecksig.c:411
+#: lib/rpmchecksig.c:391
#, fuzzy, c-format
-msgid "%s: import failed.\n"
+msgid "%s: key %d import failed.\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: readLead zlyhalo\n"
+
+#: lib/rpmchecksig.c:439
#, fuzzy, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "NIE JE V PORIADKU"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "V PORIADKU"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (CHBAJCE KE):"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (NEDVERUJE SA KOM: "
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2548,64 +2557,64 @@ msgstr "NIE JE V PORIADKU"
msgid "YES"
msgstr ""
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
#, fuzzy
msgid "internal support for lua scripts."
msgstr "- nie je podporovan pre reazce"
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "balk %s nie je naintalovan\n"
@@ -2640,47 +2649,47 @@ msgstr "nevyrieen zvislosti:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "iadny z balkov nespa %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie je mon naintalova\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Prena sa %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "%s vynechan - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "balk %s nie je naintalovan\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pri vytvran doasnho sboru %s"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" pecifikuje viac balkov\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie je mon otvori %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Intaluje sa %s\n"
@@ -2902,15 +2911,35 @@ msgstr "vykonanie skriptu zlyhalo"
msgid "Unknown format"
msgstr "neznmy tag"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "neintalovan "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "nepodarilo sa otvori %s: %s"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Nie je mon preta %s: %s."
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Nie je mon premenova %s na %s: %s\n"
+
#: lib/rpmts.c:91
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
@@ -2936,7 +2965,7 @@ msgstr "chybn slo balku: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2983,72 +3012,82 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Nie je mon spusti %s"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, fuzzy, c-format
msgid "gpg exec failed (%d)\n"
msgstr "vykonanie zlyhalo\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "gpg sa nepodarilo zapsa podpis"
-#: lib/signature.c:416
+#: lib/signature.c:439
#, fuzzy
msgid "unable to read the signature\n"
msgstr "nie je mon preta podpis"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, fuzzy, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Chybn pecifikcia %%_signature v makro-sbore.\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Muste nastavi \"%%gpg_name\" vo vaom makro-sbore"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
#, fuzzy
msgid "Header SHA1 digest:"
msgstr "zobrazi sbory v balku"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr ""
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Doplnenie podpisu: %d\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s zlyhalo"
@@ -3459,17 +3498,17 @@ msgstr "varovanie: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr ""
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "Podpis nie je k dispozcii\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(chyba 0x%x)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Nie je mon preta spec sbor z %s\n"
@@ -3548,10 +3587,6 @@ msgstr "overi podpis balka"
#~ msgstr "nepodarilo sa zisti stav %s: %s"
#, fuzzy
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "nepodarilo sa otvori %s: %s"
-
-#, fuzzy
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "sbor %s sa nachdza na neznmom zariaden"
@@ -3723,10 +3758,6 @@ msgstr "overi podpis balka"
#~ msgstr "%s: readLead zlyhalo\n"
#, fuzzy
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "Nie je mon preta %s: %s."
-
-#, fuzzy
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "expanzia %s zlyhala na %s:%d \"%s\""
diff --git a/po/sl.po b/po/sl.po
index 1c34df51c..2b5a11bbf 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2000-10-08 19:05+0200\n"
"Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -322,32 +322,32 @@ msgstr "izvajanje je bilo neuspeno\n"
msgid "no packages files given for rebuild"
msgstr "paketi za vnovino izgradnjo niso navedeni"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "datoteka spec za izgradnjo manjka"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "arhiv tar za izgradnjo manjka"
-#: rpmqv.c:709
+#: rpmqv.c:711
#, fuzzy
msgid "no packages given for erase"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "argumenti za poizvedbo niso podani"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "argumenti za preverjanje niso podani"
-#: rpmqv.c:784
+#: rpmqv.c:786
#, fuzzy
msgid "no arguments given"
msgstr "argumenti za poizvedbo niso podani"
@@ -564,7 +564,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr "%s: readLead je bil neuspeen\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
@@ -589,7 +589,7 @@ msgstr "Datoteki manjka uvodni \"/\": %s"
msgid "Glob not permitted: %s\n"
msgstr "vrstica %d: Razliica ni dovoljena: %s"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, fuzzy, c-format
msgid "File not found by glob: %s\n"
msgstr "Datoteke ni mono najti z raziritvijo metaznakov v imenu: %s"
@@ -834,12 +834,12 @@ msgstr "Izvajanje %s je bilo neuspeno (%s): %s"
msgid "Package check \"%s\" failed.\n"
msgstr "Preverjanje pristopnega gesla neuspeno\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Neuspeno ustvarjanje izhodne datoteke za paket %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "ni mono ustvariti %s: %s\n"
@@ -1019,37 +1019,37 @@ msgstr "vrstica %d: Napana oblika BuildArchitecture: %s"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, fuzzy, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Notranja napaka: Neprava znaka %d"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "vrstica %d: Zahtevana razliica: %s"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, fuzzy, c-format
msgid "Bad package specification: %s\n"
msgstr "Nepravilno doloilo paketa: %s"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, fuzzy, c-format
msgid "Package already exists: %s\n"
msgstr "Paket e obstaja: %s"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, fuzzy, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "vrstica %d: Neznana znaka: %s"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "BuildRoot ne more biti \"/\": %s"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "BuildRoot ne more biti \"/\": %s"
@@ -1625,32 +1625,32 @@ msgstr "uporabnik %s ne obstaja - uporabljam root"
msgid "group %s does not exist - using root\n"
msgstr "skupina %s ne obstaja - uporabljam root"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, fuzzy, c-format
msgid "%s saved as %s\n"
msgstr "opozorilo: %s shranjen kot %s"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, fuzzy, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "ni mono odstraniti %s - imenik ni prazen"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, fuzzy, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "odstranitev imenika %s je bila neuspena: %s"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, fuzzy, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "odpiranje %s je bilo neuspeno: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, fuzzy, c-format
msgid "%s created as %s\n"
msgstr "opozorilo: %s ustvarjen kot %s"
@@ -1730,12 +1730,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature je bil neuspeen\n"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis ni na voljo\n"
@@ -1745,7 +1745,7 @@ msgstr "%s: Podpis ni na voljo\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: readLead je bil neuspeen\n"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: branje Fread je bilo neuspeno: %s\n"
@@ -1930,7 +1930,7 @@ msgstr "okrajava za --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "paket %s-%s-%s je e nameen"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <paket>+ "
@@ -2038,6 +2038,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2045,41 +2049,41 @@ msgstr ""
"nadgraditev na starejo razliico paketa (--force pri nadgradnjah "
"avtomatino vkljui to izbiro)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "izpis odstotkov med namestitvijo"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "e je mogoe, bo paket prestavljen v imenik <imenik>"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:268
+#: lib/poptI.c:272
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "prestavljanje datoteke iz stare poti v novo"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <starapot>=<novapot>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "ponovno namesti, e paket e obstaja"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "ne namesti, a ugotovi, e bi delovalo"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <paket> "
@@ -2430,7 +2434,7 @@ msgstr "neveljavna tevilka paketa: %s\n"
msgid "record %u could not be read\n"
msgstr "zapisa %d ni mono prebrati\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s ni nameen\n"
@@ -2440,7 +2444,7 @@ msgstr "paket %s ni nameen\n"
msgid "unknown tag: \"%s\"\n"
msgstr "neznana znaka"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: odpiranje je bilo neuspeno: %s\n"
@@ -2475,52 +2479,57 @@ msgstr "%s: writeLead je bil neuspeen: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature je bilo neuspeno: %s\n"
-#: lib/rpmchecksig.c:411
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
+msgstr "%s: readLead je bil neuspeen\n"
+
+#: lib/rpmchecksig.c:395
#, fuzzy, c-format
-msgid "%s: import failed.\n"
+msgid "%s: key %d not an armored public key.\n"
msgstr "%s: readLead je bil neuspeen\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:439
#, fuzzy, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: readLead je bil neuspeen\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead je bil neuspeen\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "NI DOBRO"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "V REDU"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (MANJKAJOI KLJUI:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (NEPREVERJENI KLJUI:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2548,64 +2557,64 @@ msgstr "NI DOBRO"
msgid "YES"
msgstr ""
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
#, fuzzy
msgid "internal support for lua scripts."
msgstr "- ni podprt za nize"
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "paket %s-%s-%s je e nameen"
@@ -2640,47 +2649,47 @@ msgstr "neuspene soodvisnosti:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "noben paket ne proi %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ni mono namestiti\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Prenaanje %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "preskoeno - %s - prenos neuspeen - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "paketa %s ni mono premakniti\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "napaka pri branju iz datoteke %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "datoteka %s zahteva novejo razliico RPM\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" doloa ve paketov\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ni mono odpreti %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Nameanje %s\n"
@@ -2904,15 +2913,35 @@ msgstr "skript se ni uspeno izvedel"
msgid "Unknown format"
msgstr "neznana znaka"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "ni nameeno "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "neuspeno odpiranje %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "Neuspeno branje %s: %s."
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Preimenovanje %s v %s je bilo neuspeno: %m"
+
#: lib/rpmts.c:91
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
@@ -2938,7 +2967,7 @@ msgstr "neveljavna tevilka paketa: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: readLead je bil neuspeen\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2985,72 +3014,82 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "Ni mono izvesti %s: %s"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, fuzzy, c-format
msgid "gpg exec failed (%d)\n"
msgstr "izvajanje je bilo neuspeno\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "gpg je boil neuspeen pri zapisu podpisa"
-#: lib/signature.c:416
+#: lib/signature.c:439
#, fuzzy
msgid "unable to read the signature\n"
msgstr "branje podpisa je bilo neuspeno"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, fuzzy, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Neveljaven %%_signature v makro-datoteki.\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
#, fuzzy
msgid "Header SHA1 digest:"
msgstr "brez preverjanja datotek v paketu"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr ""
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Dol. polnila : %d\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s neuspeen"
@@ -3465,17 +3504,17 @@ msgstr "opozorilo: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "alokacija pomnilnika (%u bajtov) vrnjeno NI.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "Podpis manjka\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(napaka 0x%x)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Neuspeno branje datoteke s specifikacijami iz %s"
@@ -3560,9 +3599,6 @@ msgstr "preveri podpis paketa(-ov)"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "status %s ni na voljo: %s"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "neuspeno odpiranje %s: %s\n"
-
#, fuzzy
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "datoteka %s se nahaja na neznani napravi"
@@ -3742,10 +3778,6 @@ msgstr "preveri podpis paketa(-ov)"
#~ msgstr "%s: readLead je bil neuspeen\n"
#, fuzzy
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "Neuspeno branje %s: %s."
-
-#, fuzzy
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "raziritev %s je bila neuspena v %s:%d \"%s\""
diff --git a/po/sr.po b/po/sr.po
index 88eea8864..8896bc21b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2009-04-06 22:38+0100\n"
"Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
"Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -326,31 +326,31 @@ msgstr "неуспело извршавање\n"
msgid "no packages files given for rebuild"
msgstr "нема задатих датотека пакета за поновно прављење"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "нема задатих датотека спецификације за прављење"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "нема задатих tar датотека за прављење"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "нема задатих пакета за брисање"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "нема задатих пакета за инсталацију"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "нема задатих аргумената за упит"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "нема задатих аргумената за проверу"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "нема задатих аргумената"
@@ -556,7 +556,7 @@ msgstr "%s: не могу да учитам непознату ознаку (%d)
msgid "%s: public key read failed.\n"
msgstr "%s: неуспело читање јавног кључа.\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: јавни кључ није ојачан.\n"
@@ -581,7 +581,7 @@ msgstr "Испред датотеке је потребно да стоји „/
msgid "Glob not permitted: %s\n"
msgstr "Преклапање није дозвољено: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Датотека није пронађена поклапањем: %s\n"
@@ -824,12 +824,12 @@ msgstr "Извршавање „%s“ није успело.\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Неуспела провера пакета „%s“.\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Не могу да направим име излазне датотеке за пакет %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "не могу да направим %s: %s\n"
@@ -1009,37 +1009,37 @@ msgstr "ред %d: Лош облик за BuildArchitecture: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "ред %d: Само noarch подпакети су подржани: %s\n"
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Интерна грешка: Лажна ознака %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "ред %d: Неопходна верзија: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Лоша спецификација пакета: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Пакет већ постоји: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "ред %d: Непозната ознака: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} не може бити празно\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} не може бити „/“\n"
@@ -1594,32 +1594,32 @@ msgstr "корисник %s не постоји - користим root\n"
msgid "group %s does not exist - using root\n"
msgstr "група %s не постоји - користим root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "датотека архиве %s није пронађена у заглављу списка датотека\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s сачувано као %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s rmdir %s није успело: Директоријум није празан\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir %s није успело: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s unlink %s није успело: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s направљено као %s\n"
@@ -1699,12 +1699,12 @@ msgstr "hdr blob(%zd): ЛОШЕ, читам враћено %d\n"
msgid "hdr load: BAD\n"
msgstr "hdr load: ЛОШЕ\n"
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature није успело: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Нема потписа на располагању\n"
@@ -1714,7 +1714,7 @@ msgstr "%s: Нема потписа на располагању\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead није успело: %s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread није успело: %s\n"
@@ -1887,7 +1887,7 @@ msgstr "скраћеница за --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "надгради пакете ако су већ инсталирани"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -1991,45 +1991,49 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "немој извршити ниједну %%triggerpostun скриптицу(е)"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
"надгради на стару верзију пакета (--force код надградње ово ради самостално)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "исписуј проценте док се пакет инсталира"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "премести пакет у <dir>, ако се може преместити"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "премести датотеке из путање <old> у <new>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "занемари сукобе датотека између пакета"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "поново инсталирај ако је пакет већ присутан"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "немој инсталирати, али реци да ли би радило или не"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "надгради пакет(е)"
@@ -2342,7 +2346,7 @@ msgstr "неисправан број пакета: %s\n"
msgid "record %u could not be read\n"
msgstr "запис %lu не може бити прочитан\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "пакет %s није инсталиран\n"
@@ -2352,7 +2356,7 @@ msgstr "пакет %s није инсталиран\n"
msgid "unknown tag: \"%s\"\n"
msgstr "непозната ознака: „%s“\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: отварање није успело: %s\n"
@@ -2386,52 +2390,57 @@ msgstr "%s: writeLead није успело: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature није успело: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: увоз није успео.\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: јавни кључ није ојачан.\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: увозно читање није успело(%d).\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead није успео\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr "%s: Непромењива регија заглавља се не може ишчитати. Оштећен пакет?\n"
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr "прескачем пакет %s са непотврђеним V%u потписом\n"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "НИЈЕ УРЕДУ"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "УРЕДУ"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (НЕДОСТАЈУЋИ КЉУЧЕВИ:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (НЕПОУЗДАНИ КЉУЧЕВИ:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2458,68 +2467,68 @@ msgstr "НЕ "
msgid "YES"
msgstr "ДА"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr "Неопходне:, Обезбеђене:, и Застареле: верзије подршке зависности."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
"име(на) датотеке сачувано као (називДиректоријума,основноИме,"
"индексДиректоријума) пар, не као путања."
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "товар пакета може бити компримован користећи bzip2."
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
#, fuzzy
msgid "package payload can be compressed using xz."
msgstr "товар пакета може бити компримован користећи lzma."
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr "товар пакета може бити компримован користећи lzma."
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "датотека(е) товара пакета има префикс „./“."
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr "назив пакета-верзија-издање није имплицитно наведено."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr "ознаке заглавља се увек сортирају након учитавања."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr "преводилац скриптице може користити аргументе заглавља."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr "датотека чврсте везе може бити инсталирана иако није потпуна."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr "скриптица пакета може приступити rpm бази података током инсталације."
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "унутрашња подршка за скрипте lua."
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
#, fuzzy
msgid "file digest algorithm is per package configurable"
msgstr ""
"алгоритам за сажимање контролне суме датотеке се може подешавати по пакету"
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr "подршка за POSIX.1e могућности датотека"
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "скриптица пакета може приступити rpm бази података током инсталације."
@@ -2552,47 +2561,47 @@ msgstr "Неуспеле зависности:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: није rpm пакет (или манифест пакета): %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s се не може инсталирати\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Прибављам %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "прескачем %s - неуспео пренос\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "пакет %s се не може премештати\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "грешка при читању из датотеке %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "датотека %s захтева новију верзију RPM-а\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "„%s“ одређује више пакета:\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "не могу да отворим %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Инсталирам %s\n"
@@ -2811,15 +2820,35 @@ msgstr "%s скриптица није успела, излазни статус
msgid "Unknown format"
msgstr "Непознат облик"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "(инсталирано) "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "неуспело отварање %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "неуспело отварање %s: %s\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Неуспела промена имена %s у %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2845,7 +2874,7 @@ msgstr "недостаје „)“ у ознаци пакета: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: неуспело читање јавног кључа.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
#, fuzzy
msgid "transaction"
msgstr "направи скуп трансакција"
@@ -2893,69 +2922,79 @@ msgstr "sigh подлошка(%zd): ЛОШЕ, читам %zd бајтова\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "sigh sigSize(%zd): ЛОШЕ, fstat(2) није успео\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr "Не могу да направим цев за потписивање: %m"
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "Не могу да извршим %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "неуспело gpg извршавање (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "gpg није успео да запише потпис\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "не могу да прочитам потпис\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr "Непромењива регија заглавља се не може ишчитати. Оштећен пакет?\n"
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Неисправна спецификација %%_потписа у датотеци макроа\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Морате поставити „%%_gpg_name“ у макро датотеци\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr "MD5 сажетак:"
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "SHA1 сажетак заглавља:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Заглавље "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "Потврди потпис: ЛОШИ ПАРАМЕТРИ\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Потпис: НЕПОЗНАТ (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s није успело\n"
@@ -3362,17 +3401,17 @@ msgstr "упозорење: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "алокација меморије (%u бајта) је вратила НАЛ.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "%sV%d %s потпис: %s, ID кључа %s\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(без грешке)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Неуспело читање датотеке спецификације из %s\n"
@@ -3487,9 +3526,6 @@ msgstr "немој проверавати потпис заглавља+това
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "stat није успео %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "неуспело отварање %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "датотека %s је на непознатом уређају\n"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 688f45ab7..2498f84db 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2009-04-06 22:38+0100\n"
"Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
"Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -327,31 +327,31 @@ msgstr "neuspelo izvršavanje\n"
msgid "no packages files given for rebuild"
msgstr "nema zadatih datoteka paketa za ponovno pravljenje"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "nema zadatih datoteka specifikacije za pravljenje"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "nema zadatih tar datoteka za pravljenje"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "nema zadatih paketa za brisanje"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "nema zadatih paketa za instalaciju"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "nema zadatih argumenata za upit"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "nema zadatih argumenata za proveru"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "nema zadatih argumenata"
@@ -557,7 +557,7 @@ msgstr "%s: ne mogu da učitam nepoznatu oznaku (%d).\n"
msgid "%s: public key read failed.\n"
msgstr "%s: neuspelo čitanje javnog ključa.\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: javni ključ nije ojačan.\n"
@@ -582,7 +582,7 @@ msgstr "Ispred datoteke je potrebno da stoji „/“: %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Preklapanje nije dozvoljeno: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Datoteka nije pronađena poklapanjem: %s\n"
@@ -825,12 +825,12 @@ msgstr "Izvršavanje „%s“ nije uspelo.\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Neuspela provera paketa „%s“.\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Ne mogu da napravim ime izlazne datoteke za paket %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "ne mogu da napravim %s: %s\n"
@@ -1010,37 +1010,37 @@ msgstr "red %d: Loš oblik za BuildArchitecture: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "red %d: Samo noarch podpaketi su podržani: %s\n"
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Interna greška: Lažna oznaka %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "red %d: Neophodna verzija: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Loša specifikacija paketa: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Paket već postoji: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "red %d: Nepoznata oznaka: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} ne može biti prazno\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} ne može biti „/“\n"
@@ -1595,32 +1595,32 @@ msgstr "korisnik %s ne postoji - koristim root\n"
msgid "group %s does not exist - using root\n"
msgstr "grupa %s ne postoji - koristim root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "datoteka arhive %s nije pronađena u zaglavlju spiska datoteka\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s sačuvano kao %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s rmdir %s nije uspelo: Direktorijum nije prazan\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir %s nije uspelo: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s unlink %s nije uspelo: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s napravljeno kao %s\n"
@@ -1700,12 +1700,12 @@ msgstr "hdr blob(%zd): LOŠE, čitam vraćeno %d\n"
msgid "hdr load: BAD\n"
msgstr "hdr load: LOŠE\n"
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature nije uspelo: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Nema potpisa na raspolaganju\n"
@@ -1715,7 +1715,7 @@ msgstr "%s: Nema potpisa na raspolaganju\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead nije uspelo: %s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread nije uspelo: %s\n"
@@ -1889,7 +1889,7 @@ msgstr "skraćenica za --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "nadgradi pakete ako su već instalirani"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -1993,45 +1993,49 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nemoj izvršiti nijednu %%triggerpostun skripticu(e)"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
"nadgradi na staru verziju paketa (--force kod nadgradnje ovo radi samostalno)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "ispisuj procente dok se paket instalira"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "premesti paket u <dir>, ako se može premestiti"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "premesti datoteke iz putanje <old> u <new>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "zanemari sukobe datoteka između paketa"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "ponovo instaliraj ako je paket već prisutan"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "nemoj instalirati, ali reci da li bi radilo ili ne"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "nadgradi paket(e)"
@@ -2344,7 +2348,7 @@ msgstr "neispravan broj paketa: %s\n"
msgid "record %u could not be read\n"
msgstr "zapis %lu ne može biti pročitan\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
@@ -2354,7 +2358,7 @@ msgstr "paket %s nije instaliran\n"
msgid "unknown tag: \"%s\"\n"
msgstr "nepoznata oznaka: „%s“\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otvaranje nije uspelo: %s\n"
@@ -2388,53 +2392,58 @@ msgstr "%s: writeLead nije uspelo: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature nije uspelo: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: uvoz nije uspeo.\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: javni ključ nije ojačan.\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: uvozno čitanje nije uspelo(%d).\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead nije uspeo\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
"%s: Nepromenjiva regija zaglavlja se ne može iščitati. Oštećen paket?\n"
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr "preskačem paket %s sa nepotvrđenim V%u potpisom\n"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "NIJE UREDU"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "UREDU"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (NEDOSTAJUĆI KLJUČEVI:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (NEPOUZDANI KLJUČEVI:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2461,68 +2470,68 @@ msgstr "NE "
msgid "YES"
msgstr "DA"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr "Neophodne:, Obezbeđene:, i Zastarele: verzije podrške zavisnosti."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
"ime(na) datoteke sačuvano kao (nazivDirektorijuma,osnovnoIme,"
"indeksDirektorijuma) par, ne kao putanja."
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "tovar paketa može biti komprimovan koristeći bzip2."
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
#, fuzzy
msgid "package payload can be compressed using xz."
msgstr "tovar paketa može biti komprimovan koristeći lzma."
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr "tovar paketa može biti komprimovan koristeći lzma."
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "datoteka(e) tovara paketa ima prefiks „./“."
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr "naziv paketa-verzija-izdanje nije implicitno navedeno."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr "oznake zaglavlja se uvek sortiraju nakon učitavanja."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr "prevodilac skriptice može koristiti argumente zaglavlja."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr "datoteka čvrste veze može biti instalirana iako nije potpuna."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr "skriptica paketa može pristupiti rpm bazi podataka tokom instalacije."
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "unutrašnja podrška za skripte lua."
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
#, fuzzy
msgid "file digest algorithm is per package configurable"
msgstr ""
"algoritam za sažimanje kontrolne sume datoteke se može podešavati po paketu"
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr "podrška za POSIX.1e mogućnosti datoteka"
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "skriptica paketa može pristupiti rpm bazi podataka tokom instalacije."
@@ -2555,47 +2564,47 @@ msgstr "Neuspele zavisnosti:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: nije rpm paket (ili manifest paketa): %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s se ne može instalirati\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Pribavljam %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "preskačem %s - neuspeo prenos\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "paket %s se ne može premeštati\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "greška pri čitanju iz datoteke %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "datoteka %s zahteva noviju verziju RPM-a\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "„%s“ određuje više paketa:\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ne mogu da otvorim %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
@@ -2814,15 +2823,35 @@ msgstr "%s skriptica nije uspela, izlazni status %d\n"
msgid "Unknown format"
msgstr "Nepoznat oblik"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "(instalirano) "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "neuspelo otvaranje %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "neuspelo otvaranje %s: %s\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Neuspela promena imena %s u %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2848,7 +2877,7 @@ msgstr "nedostaje „)“ u oznaci paketa: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: neuspelo čitanje javnog ključa.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
#, fuzzy
msgid "transaction"
msgstr "napravi skup transakcija"
@@ -2896,69 +2925,79 @@ msgstr "sigh podloška(%zd): LOŠE, čitam %zd bajtova\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "sigh sigSize(%zd): LOŠE, fstat(2) nije uspeo\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr "Ne mogu da napravim cev za potpisivanje: %m"
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "Ne mogu da izvršim %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "neuspelo gpg izvršavanje (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "gpg nije uspeo da zapiše potpis\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "ne mogu da pročitam potpis\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr "Nepromenjiva regija zaglavlja se ne može iščitati. Oštećen paket?\n"
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Neispravna specifikacija %%_potpisa u datoteci makroa\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Morate postaviti „%%_gpg_name“ u makro datoteci\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr "MD5 sažetak:"
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "SHA1 sažetak zaglavlja:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Zaglavlje "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "Potvrdi potpis: LOŠI PARAMETRI\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Potpis: NEPOZNAT (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s nije uspelo\n"
@@ -3366,17 +3405,17 @@ msgstr "upozorenje: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "alokacija memorije (%u bajta) je vratila NAL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "%sV%d %s potpis: %s, ID ključa %s\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(bez greške)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Neuspelo čitanje datoteke specifikacije iz %s\n"
@@ -3491,9 +3530,6 @@ msgstr "nemoj proveravati potpis zaglavlja+tovara"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "stat nije uspeo %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "neuspelo otvaranje %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "datoteka %s je na nepoznatom uređaju\n"
diff --git a/po/sv.po b/po/sv.po
index f5c8b0937..e4f11f75e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2009-01-17 17:20+0100\n"
"Last-Translator: Gran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -324,31 +324,31 @@ msgstr "exec misslyckades\n"
msgid "no packages files given for rebuild"
msgstr "inga paketfiler angivna fr ombyggnation"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "inga specfiler angivna fr byggnation"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "inga tar-filer angivna fr byggnation"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "inga paket angivna att radera"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "inga paket angivna fr installation"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "inga parametrar angivna fr frga"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "inga parametrar angivna fr verifiering"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "inga argument angivna"
@@ -554,7 +554,7 @@ msgstr "%s: kan inte lsa oknd tagg (%d).\n"
msgid "%s: public key read failed.\n"
msgstr "%s: lsning av publik nyckel misslyckades.\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: inte en publik nyckel med skal.\n"
@@ -579,7 +579,7 @@ msgstr "Filen behver inledande \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Matchning inte tilltet: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Hittade ingen fil vid matchningen: %s\n"
@@ -822,12 +822,12 @@ msgstr "Krning av \"%s\" misslyckades.\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Paketkontroll \"%s\" misslyckades.\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "Kunde inte generera utfilnamn fr paketet %s: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "kan inte skapa %s: %s\n"
@@ -1007,37 +1007,37 @@ msgstr "rad %d: Felaktigt BuildArchitecture-format: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "rad %d: Endast noarch-underpaket stds: %s\n"
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Internt fel: felaktig tagg %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "rad %d: Version krvs: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Felaktig paketangivelse %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Paketet existerar redan: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "rad %d: Oknd tagg: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} fick inte vara tom\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} kan inte vara \"/\"\n"
@@ -1596,32 +1596,32 @@ msgstr "anvndare %s finns inte - anvnder root\n"
msgid "group %s does not exist - using root\n"
msgstr "grupp %s finns inte - anvnder root\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "arkivfil %s fanns inte i huvudets fillista\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s sparades som %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s rmdir av %s misslyckades: Katalogen r inte tom\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s rmdir av %s misslyckades: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s unlink av %s misslyckades: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s skapades som %s\n"
@@ -1701,12 +1701,12 @@ msgstr "hvdklick(%zd): FEL, lsning returnerade %d\n"
msgid "hdr load: BAD\n"
msgstr "hvdlast: FEL\n"
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature misslyckades: %s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tillgnglig\n"
@@ -1716,7 +1716,7 @@ msgstr "%s: Ingen signatur tillgnglig\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: headerRead misslyckades: %s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread misslyckades: %s\n"
@@ -1889,7 +1889,7 @@ msgstr "kortform fr --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "uppgradera paket om redan installerade"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<paketfil>+"
@@ -1993,6 +1993,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "kr inte %%triggerpostun-skript"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2000,39 +2004,39 @@ msgstr ""
"uppgradera till en gammal version av paketet (--force vid uppgraderingar gr "
"detta automatiskt)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "skriv procent allt eftersom paketet installeras"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "flytta paketet till <katalog>, om flyttbart"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<kat>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "relokera filer frn <gammal> till <ny>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<gammal>=<ny>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "ingorera filkonflikter mellan paket"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "ominstallera nr paketet redan r installerat"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "installera inte, men tala om ifall det skulle fungera eller inte"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "uppgradera paket"
@@ -2345,7 +2349,7 @@ msgstr "felaktigt paketnummer: %s\n"
msgid "record %u could not be read\n"
msgstr "post %lu kunde inte lsas\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s r inte installerat\n"
@@ -2355,7 +2359,7 @@ msgstr "paket %s r inte installerat\n"
msgid "unknown tag: \"%s\"\n"
msgstr "oknd tagg: \"%s\"\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: open misslyckades: %s\n"
@@ -2389,52 +2393,57 @@ msgstr "%s: writeLead misslyckades: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature misslyckades: %s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s: import misslyckades.\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s: inte en publik nyckel med skal.\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: importlsning misslyckades(%d).\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead misslyckades\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr "%s: Ofrnderlig huvudregion kunde inte lsas. Trasigt paket?\n"
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr "hoppar ver paket %s med overifierbar V%u-signatur\n"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "EJ OK"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (SAKNADE NYCKLAR:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (EJ BETRODDA NYCKLAR:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2461,65 +2470,65 @@ msgstr "NEJ "
msgid "YES"
msgstr "JA"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr "PreReq:, Provides:, and Obsoletes:-beroenden stdjer versioner."
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr "filnamn lagrade som (katNamn,basNam,katIndex)-tupel, inte som skvg."
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "paketlasten kan komprimeras med bzip2."
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
#, fuzzy
msgid "package payload can be compressed using xz."
msgstr "paketlasten kan komprimeras med lzma."
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr "paketlasten kan komprimeras med lzma."
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "paketlastfiler har \"./\"-prefix."
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr "paketets namn-version-utgva tillhandahlls inte implicit."
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr "huvudtaggar sorteras alltid efter att ha lsts in."
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr "skriptinterpretatorn kan anvnda argument frn huvudet."
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr "en hrdlnkad filuppsttning fr installeras utan att vara komplett."
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr "paketskript kan komma t rpm-databasen under installation."
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "internt std fr lua-skript."
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
#, fuzzy
msgid "file digest algorithm is per package configurable"
msgstr "filkontrollsummealgoritm r konfigurerbar per paket"
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr "std fr filfrmgor (capabilities) enligt POSIX.1e"
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "paketskript kan komma t rpm-databasen under installation."
@@ -2552,47 +2561,47 @@ msgstr "Ouppfyllda beroenden:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: inte ett rpm-paket (eller paketspecifikation): %s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kan inte installeras\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "Hmtar %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "hoppar ver %s - verfring misslyckades\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "paket %s r inte relokerbart\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "fel vid lsning frn fil %s\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "filen %s behver en nyare version av RPM\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" anger flera paket:\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte ppna %s: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "Installerar %s\n"
@@ -2810,15 +2819,35 @@ msgstr "%s-skript misslyckades, slutstatus %d\n"
msgid "Unknown format"
msgstr "Oknt format"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "(installerat) "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "kunde inte ppna %s: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "kunde inte ppna %s: %s\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "Kunde inte byta namn p %s till %s: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2844,7 +2873,7 @@ msgstr "\")\" saknas i paketetikett: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: misslyckades att lsa publik nyckel.\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
#, fuzzy
msgid "transaction"
msgstr "skapa transaktionsmngd"
@@ -2892,69 +2921,79 @@ msgstr "sighutfyllnad(%zd): FEL, lste %zd byte\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "sigh sigSize(%zd): FEL, fstat(2) misslyckades\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr "Det gick inte att skapa ett rr fr signering: %m"
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "Kunde inte kra %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "gpg exec misslyckades (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "gpg kunde inte skriva signatur\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "kan inte lsa signaturen\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr "Ofrnderlig huvudregion kunde inte lsas. Trasigt paket?\n"
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Felaktig %%_signature-spec i makrofil\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Du mste stta \"%%_gpg_name\" i din makrofil\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr "MD5-summa:"
-#: lib/signature.c:780
+#: lib/signature.c:803
msgid "Header SHA1 digest:"
msgstr "Huvudets SHA1-summa:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "Huvud "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "Verifiera signatur: FELAKTIGA PARAMETRAR\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signatur: OKND (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s misslyckades\n"
@@ -3358,17 +3397,17 @@ msgstr "varning: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "minnesallokering (%u byte) returnerade NULL.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "%sV%d %s-signatur: %s, nyckel-id %s\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(inget fel)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "Kunde inte lsa specfil frn %s\n"
@@ -3481,9 +3520,6 @@ msgstr "verifiera inte huvud+lastsignatur"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "kunde inte ta status p %s: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "kunde inte ppna %s: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "filen %s r p en oknd enhet\n"
diff --git a/po/tr.po b/po/tr.po
index 8e2517868..81da3b282 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2001-07-05 08:02+300\n"
"Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
@@ -326,32 +326,32 @@ msgstr "icra baarsz\n"
msgid "no packages files given for rebuild"
msgstr "yeniden oluturmak iin paket dosyalar belirtilmemi"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "oluturma iin gerekli spec dosyas belirtilmemi"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "oluturma iin gereken tar dosyalar belirtilmemi"
-#: rpmqv.c:709
+#: rpmqv.c:711
#, fuzzy
msgid "no packages given for erase"
msgstr "yklenecek paket(ler) belirtilmedi"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "yklenecek paket(ler) belirtilmedi"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "sorgulama iin hi argman belirtilmedi"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "denetleme iin hi argman belirtilmedi"
-#: rpmqv.c:784
+#: rpmqv.c:786
#, fuzzy
msgid "no arguments given"
msgstr "sorgulama iin hi argman belirtilmedi"
@@ -558,7 +558,7 @@ msgstr ""
msgid "%s: public key read failed.\n"
msgstr "%s: readLead baarsz\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
@@ -583,7 +583,7 @@ msgstr "Dosya \"/\" ile iermeli: %s\n"
msgid "Glob not permitted: %s\n"
msgstr "satr %d: Dosya ad uygun deil: %s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Dosya glob tarafndan bulunamad: %s\n"
@@ -827,12 +827,12 @@ msgstr "%s 'in icras baarsz (%s): %s\n"
msgid "Package check \"%s\" failed.\n"
msgstr "Anahtar parolas kontrol baarsz\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "%s paket dosyas iin kt dosya ad retilemedi: %s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "%s dosyas oluturulamyor: %s\n"
@@ -1012,37 +1012,37 @@ msgstr "satr %d: BuildArchitecture biimi hatal: %s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "sel hata: %d etiketi sahte\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "satr %d: Srm gerekli: %s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Paket zellikleri hatal: %s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "Paket zaten var: %s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "satr %d: Bilinmeyen etiket: %s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "BuildRoot \"/\" olamaz: %s\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "BuildRoot \"/\" olamaz: %s\n"
@@ -1614,32 +1614,32 @@ msgstr "kullanc %s yok - root kullanlacak\n"
msgid "group %s does not exist - using root\n"
msgstr "grup %s yok - root kullanlacak\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr ""
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s %s olarak kaydedildi\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s / %s dizin silinemedi - Dizin bo deil\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s / %s dizinin silinmesi baarsz: %s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s / %s ba kaldrlamad: %s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s %s olarak oluturuldu\n"
@@ -1719,12 +1719,12 @@ msgstr ""
msgid "hdr load: BAD\n"
msgstr ""
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s: rpmReadSignature baarsz\n"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: mza bulundurmuyor\n"
@@ -1734,7 +1734,7 @@ msgstr "%s: mza bulundurmuyor\n"
msgid "%s: headerRead failed: %s"
msgstr "%s: readLead baarsz\n"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread baarsz: %s\n"
@@ -1915,7 +1915,7 @@ msgstr "--replacepkgs --replacefiles iin ksaltma"
msgid "upgrade package(s) if already installed"
msgstr "paket(ler) kurulu ise paket(ler)i gnceller"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<paketDosyas>+"
@@ -2020,6 +2020,10 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "hibir %%triggerpostun betii altrlmaz."
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2027,39 +2031,39 @@ msgstr ""
"paketin eski bir srme gncellenmesini salar (--force ayn ii otomatik "
"yapar)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "kurulumun geliimi yzde olarak gsterilir"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "eer deitirilebiliyorsa paketin yerini <dizin>'e deitirir"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<dizin>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "dosyalar <eski> dizininden kaldrp <yeni> dizinine yerletirir"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<eski>=<yeni>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "paketi yeniden kurar"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "ykleme yapmaz, sadece alp almayacan belirtir"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "paket gnceller"
@@ -2391,7 +2395,7 @@ msgstr "geersiz paket numaras: %s\n"
msgid "record %u could not be read\n"
msgstr "%u. kayt okunamad\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "%s paketi kurulu deil\n"
@@ -2401,7 +2405,7 @@ msgstr "%s paketi kurulu deil\n"
msgid "unknown tag: \"%s\"\n"
msgstr "bilinmeyen etiket"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: alamad: %s\n"
@@ -2436,52 +2440,57 @@ msgstr "%s: writeLead baarsz: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature baarsz: %s\n"
-#: lib/rpmchecksig.c:411
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
+msgstr "%s: readLead baarsz\n"
+
+#: lib/rpmchecksig.c:395
#, fuzzy, c-format
-msgid "%s: import failed.\n"
+msgid "%s: key %d not an armored public key.\n"
msgstr "%s: readLead baarsz\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:439
#, fuzzy, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s: readLead baarsz\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead baarsz\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "TAMAM DEL"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "Tamam"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (EKSK ANAHTARLAR:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (GVENCESZ ANAHTARLAR:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2508,64 +2517,64 @@ msgstr "HAYIR "
msgid "YES"
msgstr "EVET"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr ""
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr ""
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr ""
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
msgid "package payload can be compressed using xz."
msgstr ""
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
msgid "package payload can be compressed using lzma."
msgstr ""
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr ""
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr ""
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr ""
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr ""
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr ""
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr ""
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
#, fuzzy
msgid "internal support for lua scripts."
msgstr "- dizgelerde desteklenmez\n"
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "%s zaten kurulu"
@@ -2599,47 +2608,47 @@ msgstr "bamllklarda hata; gerekli paketler:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s tetikleyen paket yok\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s yklenemedi\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "%s alnyor\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "%s atlanyor - aktarm baarsz - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "%s paketi yeniden konumlandrlamaz\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "%s dosyasndan okuma hatal\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "%s dosyas RPM'nin daha yeni bir srmn gerektiriyor\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" birden fazla paketi tanmlyor\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s alamad: %s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "%s kuruluyor\n"
@@ -2861,15 +2870,35 @@ msgstr "%s betiinin %s-%s-%s'den icras baarsz, kta durum %d\n"
msgid "Unknown format"
msgstr "bilinmeyen etiket"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "yklenmedi "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "%s alamad: %s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "%s okunamad: %s.\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "%s %s olarak deitirilemedi: %m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2895,7 +2924,7 @@ msgstr "geersiz paket numaras: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: readLead baarsz\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
msgid "transaction"
msgstr ""
@@ -2942,70 +2971,80 @@ msgstr ""
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr ""
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, fuzzy, c-format
msgid "Could not exec %s: %s\n"
msgstr "%s icra edilemedi: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, fuzzy, c-format
msgid "gpg exec failed (%d)\n"
msgstr "icra baarsz\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "imzann yazlmas srasnda gpg hata verdi\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "imza okunamad\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Makro dosyasnda %%_signature spec geersiz\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Makro dosyanzda \"%%_pgp_name\" tanmlanm olmal\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
msgid "MD5 digest:"
msgstr ""
-#: lib/signature.c:780
+#: lib/signature.c:803
#, fuzzy
msgid "Header SHA1 digest:"
msgstr "Balk SHA1 zmlemesi dorulanmaz"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr ""
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr ""
-#: lib/signature.c:869
+#: lib/signature.c:892
#, fuzzy, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "mza: boyut(%d)+iz(%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s baarsz\n"
@@ -3412,17 +3451,17 @@ msgstr "uyar: "
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "bellek ayrlrken (%u bayt) NULL dnd.\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr "mza yok\n"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(hata yok)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "%s paketinden spec dosyas okunamad\n"
@@ -3512,9 +3551,6 @@ msgstr "paket imzasn denetler"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "stat %s baarsz: %s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "%s alamad: %s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "%s dosyasnn bulunduu aygt anlalamad\n"
@@ -3690,9 +3726,6 @@ msgstr "paket imzasn denetler"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s: readLead baarsz\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "%s okunamad: %s.\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "%s geniletmesi %s:%d \"%s\" de baarsz \n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b38c7bd10..6786acd19 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm 4.4.2\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-05-31 14:32+0300\n"
+"POT-Creation-Date: 2010-06-29 11:58+0300\n"
"PO-Revision-Date: 2007-05-05 10:52+0800\n"
"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -314,31 +314,31 @@ msgstr "執行失敗\n"
msgid "no packages files given for rebuild"
msgstr "沒有指定要重建的套件名稱"
-#: rpmqv.c:686
+#: rpmqv.c:688
msgid "no spec files given for build"
msgstr "沒有指定用於組建的規格檔案名稱"
-#: rpmqv.c:688
+#: rpmqv.c:690
msgid "no tar files given for build"
msgstr "沒有指定用於組建的打包檔案名稱"
-#: rpmqv.c:709
+#: rpmqv.c:711
msgid "no packages given for erase"
msgstr "沒有指定要清除的套件名稱"
-#: rpmqv.c:743
+#: rpmqv.c:745
msgid "no packages given for install"
msgstr "沒有指定要安裝的套件名稱"
-#: rpmqv.c:755
+#: rpmqv.c:757
msgid "no arguments given for query"
msgstr "沒有指定查詢引數"
-#: rpmqv.c:769
+#: rpmqv.c:771
msgid "no arguments given for verify"
msgstr "沒有指定校驗引數"
-#: rpmqv.c:784
+#: rpmqv.c:786
msgid "no arguments given"
msgstr "沒有指定引數"
@@ -544,7 +544,7 @@ msgstr "%s:無法呼叫不明的標記 (%d)。\n"
msgid "%s: public key read failed.\n"
msgstr "%s:公鑰讀入失敗。\n"
-#: build/files.c:1626 lib/rpmchecksig.c:418
+#: build/files.c:1626
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s:不是一個受保護的公鑰。\n"
@@ -569,7 +569,7 @@ msgstr "檔案需要以「/」開頭:%s\n"
msgid "Glob not permitted: %s\n"
msgstr "不容許以萬用字元解析:%s\n"
-#: build/files.c:1715 lib/rpminstall.c:421
+#: build/files.c:1715 lib/rpminstall.c:419
#, c-format
msgid "File not found by glob: %s\n"
msgstr "以萬用字元解析找不到檔案:%s\n"
@@ -812,12 +812,12 @@ msgstr "執行 %s 失敗 (%s):%s\n"
msgid "Package check \"%s\" failed.\n"
msgstr "密文偵測失敗\n"
-#: build/pack.c:762
+#: build/pack.c:766
#, c-format
msgid "Could not generate output filename for package %s: %s\n"
msgstr "無法產生套件 %s 的檔案名稱輸出:%s\n"
-#: build/pack.c:779
+#: build/pack.c:783
#, c-format
msgid "cannot create %s: %s\n"
msgstr "無法建立 %s:%s\n"
@@ -997,37 +997,37 @@ msgstr "列 %d:損壞的組建架構格式:%s\n"
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:667
+#: build/parsePreamble.c:670
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "內部錯誤:假造的標記 %d\n"
-#: build/parsePreamble.c:748
+#: build/parsePreamble.c:752
#, fuzzy, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "列 %d:需要版本描述:%s\n"
-#: build/parsePreamble.c:811
+#: build/parsePreamble.c:815
#, c-format
msgid "Bad package specification: %s\n"
msgstr "不當的套件規格:%s\n"
-#: build/parsePreamble.c:817
+#: build/parsePreamble.c:821
#, c-format
msgid "Package already exists: %s\n"
msgstr "套件已存在:%s\n"
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:852
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "列 %d:不明標記:%s\n"
-#: build/parsePreamble.c:880
+#: build/parsePreamble.c:884
#, fuzzy, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "BuildRoot 不能是「/」:%s\n"
-#: build/parsePreamble.c:884
+#: build/parsePreamble.c:888
#, fuzzy, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "BuildRoot 不能是「/」:%s\n"
@@ -1578,32 +1578,32 @@ msgstr "使用者 %s 不存在 - 現使用 root 代替\n"
msgid "group %s does not exist - using root\n"
msgstr "使用者組 %s 不存在 - 現使用 root 代替\n"
-#: lib/fsm.c:1499
+#: lib/fsm.c:1514
#, c-format
msgid "archive file %s was not found in header file list\n"
msgstr "保存檔案 %s 在檔案清單表頭中找不到\n"
-#: lib/fsm.c:1617 lib/fsm.c:1745
+#: lib/fsm.c:1632 lib/fsm.c:1760
#, c-format
msgid "%s saved as %s\n"
msgstr "%s 已被另存為 %s\n"
-#: lib/fsm.c:1772
+#: lib/fsm.c:1787
#, c-format
msgid "%s rmdir of %s failed: Directory not empty\n"
msgstr "%s 移除目錄 %s 失敗:目錄非空\n"
-#: lib/fsm.c:1778
+#: lib/fsm.c:1793
#, c-format
msgid "%s rmdir of %s failed: %s\n"
msgstr "%s 移除目錄 %s 失敗:%s\n"
-#: lib/fsm.c:1792
+#: lib/fsm.c:1807
#, c-format
msgid "%s unlink of %s failed: %s\n"
msgstr "%s 刪除檔案 %s 失敗:%s\n"
-#: lib/fsm.c:1814
+#: lib/fsm.c:1829
#, c-format
msgid "%s created as %s\n"
msgstr "%s 如同 %s 而建立\n"
@@ -1683,12 +1683,12 @@ msgstr "hdr blob(%d):不當的,讀取回傳 %d\n"
msgid "hdr load: BAD\n"
msgstr "hdr 載入:不當的\n"
-#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:623
+#: lib/package.c:582 lib/rpmchecksig.c:183 lib/rpmchecksig.c:645
#, c-format
msgid "%s: rpmReadSignature failed: %s"
msgstr "%s:rpmReadSignature 失敗:%s"
-#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:630
+#: lib/package.c:589 lib/rpmchecksig.c:190 lib/rpmchecksig.c:652
#, c-format
msgid "%s: No signature available\n"
msgstr "%s:未發現簽名\n"
@@ -1698,7 +1698,7 @@ msgstr "%s:未發現簽名\n"
msgid "%s: headerRead failed: %s"
msgstr "%s::headerRead 失敗:%s"
-#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:463
+#: lib/package.c:686 lib/rpmchecksig.c:91 lib/rpmchecksig.c:485
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread 失敗:%s\n"
@@ -1869,7 +1869,7 @@ msgstr "--replacepkgs 與 --replacefiles 的速寫"
msgid "upgrade package(s) if already installed"
msgstr "如果套件已安裝,執行更新"
-#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:281
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:285
msgid "<packagefile>+"
msgstr "<套件檔案>+"
@@ -1972,44 +1972,48 @@ msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "不執行任何作業後觸發執行的短命令稿"
#: lib/poptI.c:259
+msgid "do not perform any collection actions"
+msgstr ""
+
+#: lib/poptI.c:263
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr "更新到一個舊版本的套件 (在更新作業中 --force 指令會自動進行此步驟)"
-#: lib/poptI.c:263
+#: lib/poptI.c:267
msgid "print percentages as package installs"
msgstr "安裝套件時印出進度百分比"
-#: lib/poptI.c:265
+#: lib/poptI.c:269
msgid "relocate the package to <dir>, if relocatable"
msgstr "如果可以,把套件重新部署到 <目錄>"
-#: lib/poptI.c:266
+#: lib/poptI.c:270
msgid "<dir>"
msgstr "<目錄>"
-#: lib/poptI.c:268
+#: lib/poptI.c:272
msgid "relocate files from path <old> to <new>"
msgstr "將檔案從 <舊目錄> 重新部署到 <新目錄>"
-#: lib/poptI.c:269
+#: lib/poptI.c:273
msgid "<old>=<new>"
msgstr "<舊目錄>=<新目錄>"
-#: lib/poptI.c:272
+#: lib/poptI.c:276
msgid "ignore file conflicts between packages"
msgstr "忽略套件之間的檔案衝突"
-#: lib/poptI.c:275
+#: lib/poptI.c:279
msgid "reinstall if the package is already present"
msgstr "如果套件已存在則重新安裝"
-#: lib/poptI.c:277
+#: lib/poptI.c:281
msgid "don't install, but tell if it would work or not"
msgstr "不真正安裝,只回報作業結果是否正確"
-#: lib/poptI.c:280
+#: lib/poptI.c:284
msgid "upgrade package(s)"
msgstr "更新套件"
@@ -2324,7 +2328,7 @@ msgstr "不正確的套件編號:%s\n"
msgid "record %u could not be read\n"
msgstr "記錄 %u 無法讀取\n"
-#: lib/query.c:518 lib/rpminstall.c:667
+#: lib/query.c:518 lib/rpminstall.c:665
#, c-format
msgid "package %s is not installed\n"
msgstr "套件 %s 尚未安裝\n"
@@ -2334,7 +2338,7 @@ msgstr "套件 %s 尚未安裝\n"
msgid "unknown tag: \"%s\"\n"
msgstr "不明的標記:「%s」\n"
-#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:800
+#: lib/rpmchecksig.c:51 lib/rpmchecksig.c:822
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s:開啟失敗:%s\n"
@@ -2369,52 +2373,57 @@ msgstr "%s:writeLead 失敗:%s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s:rpmWriteSignature 失敗:%s\n"
-#: lib/rpmchecksig.c:411
-#, c-format
-msgid "%s: import failed.\n"
+#: lib/rpmchecksig.c:391
+#, fuzzy, c-format
+msgid "%s: key %d import failed.\n"
msgstr "%s:匯入失敗。\n"
-#: lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:395
+#, fuzzy, c-format
+msgid "%s: key %d not an armored public key.\n"
+msgstr "%s:不是一個受保護的公鑰。\n"
+
+#: lib/rpmchecksig.c:439
#, c-format
msgid "%s: import read failed(%d).\n"
msgstr "%s:匯入讀取時失敗(%d)。\n"
-#: lib/rpmchecksig.c:442
+#: lib/rpmchecksig.c:464
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s:headerRead 失敗\n"
-#: lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:473
#, c-format
msgid "%s: Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/rpmchecksig.c:485
+#: lib/rpmchecksig.c:507
#, c-format
msgid "skipping package %s with unverifiable V%u signature\n"
msgstr ""
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "NOT OK"
msgstr "不正確"
-#: lib/rpmchecksig.c:733
+#: lib/rpmchecksig.c:755
msgid "OK"
msgstr "正確"
-#: lib/rpmchecksig.c:735
+#: lib/rpmchecksig.c:757
msgid " (MISSING KEYS:"
msgstr " (丟失的密鑰:"
-#: lib/rpmchecksig.c:737
+#: lib/rpmchecksig.c:759
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:738
+#: lib/rpmchecksig.c:760
msgid " (UNTRUSTED KEYS:"
msgstr " (不信任的密鑰:"
-#: lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:762
msgid ")"
msgstr ")"
@@ -2441,65 +2450,65 @@ msgstr "否 "
msgid "YES"
msgstr "是"
-#: lib/rpmds.c:852
+#: lib/rpmds.c:845
msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
msgstr "PreReq:、Provides:、以及 Obsoletes: 相依支援版本。"
-#: lib/rpmds.c:855
+#: lib/rpmds.c:848
msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
msgstr "檔案名稱儲存為 (dirName、baseName、dirIndex) 字組,而非路徑。"
-#: lib/rpmds.c:859
+#: lib/rpmds.c:852
msgid "package payload can be compressed using bzip2."
msgstr "套件酬載可以使用 bzip2 壓縮。"
-#: lib/rpmds.c:864
+#: lib/rpmds.c:857
#, fuzzy
msgid "package payload can be compressed using xz."
msgstr "套件酬載可以使用 bzip2 壓縮。"
-#: lib/rpmds.c:867
+#: lib/rpmds.c:860
#, fuzzy
msgid "package payload can be compressed using lzma."
msgstr "套件酬載可以使用 bzip2 壓縮。"
-#: lib/rpmds.c:871
+#: lib/rpmds.c:864
msgid "package payload file(s) have \"./\" prefix."
msgstr "套件酬載檔案有\"./\"字首。"
-#: lib/rpmds.c:874
+#: lib/rpmds.c:867
msgid "package name-version-release is not implicitly provided."
msgstr "套件的名稱-版本-發行編號沒有被隱含指出。"
-#: lib/rpmds.c:877
+#: lib/rpmds.c:870
msgid "header tags are always sorted after being loaded."
msgstr "表頭標記總在載入之後自動排序。"
-#: lib/rpmds.c:880
+#: lib/rpmds.c:873
msgid "the scriptlet interpreter can use arguments from header."
msgstr "命令稿解譯器可以從表頭中呼叫引數。"
-#: lib/rpmds.c:883
+#: lib/rpmds.c:876
msgid "a hardlink file set may be installed without being complete."
msgstr "硬式鏈結檔案組合也許沒有被完整安裝。"
-#: lib/rpmds.c:886
+#: lib/rpmds.c:879
msgid "package scriptlets may access the rpm database while installing."
msgstr "套件內建短命令稿在安裝程序中可以存取 rpm 資料庫。"
-#: lib/rpmds.c:890
+#: lib/rpmds.c:883
msgid "internal support for lua scripts."
msgstr "內部支援 lua 命令稿。"
-#: lib/rpmds.c:894
+#: lib/rpmds.c:887
msgid "file digest algorithm is per package configurable"
msgstr ""
-#: lib/rpmds.c:898
+#: lib/rpmds.c:891
msgid "support for POSIX.1e file capabilities"
msgstr ""
-#: lib/rpmds.c:902
+#: lib/rpmds.c:895
#, fuzzy
msgid "package scriptlets can be expanded at install time."
msgstr "套件內建短命令稿在安裝程序中可以存取 rpm 資料庫。"
@@ -2532,47 +2541,47 @@ msgstr "相依性偵測失敗:\n"
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: 不是 rpm 套件(或套件清單):%s\n"
-#: lib/rpminstall.c:345 lib/rpminstall.c:729 tools/rpmgraph.c:139
+#: lib/rpminstall.c:345 lib/rpminstall.c:727 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s 無法安裝\n"
-#: lib/rpminstall.c:459
+#: lib/rpminstall.c:457
#, c-format
msgid "Retrieving %s\n"
msgstr "取回中 %s\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:469
#, fuzzy, c-format
msgid "skipping %s - transfer failed\n"
msgstr "略過 %s - 傳輸失敗 - %s\n"
-#: lib/rpminstall.c:538
+#: lib/rpminstall.c:536
#, c-format
msgid "package %s is not relocatable\n"
msgstr "套件 %s 不能重新部署\n"
-#: lib/rpminstall.c:565
+#: lib/rpminstall.c:563
#, c-format
msgid "error reading from file %s\n"
msgstr "讀取檔案 %s 時發生錯誤\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:569
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "檔案 %s 需要更新版本的 RPM\n"
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:672
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "「%s」指定了多個套件\n"
-#: lib/rpminstall.c:713
+#: lib/rpminstall.c:711
#, c-format
msgid "cannot open %s: %s\n"
msgstr "無法開啟檔案 %s:%s\n"
-#: lib/rpminstall.c:719
+#: lib/rpminstall.c:717
#, c-format
msgid "Installing %s\n"
msgstr "正在安裝 %s\n"
@@ -2793,15 +2802,35 @@ msgstr "%s(%s-%s-%s.%s) 短命令稿執行失敗,離開狀態 %d\n"
msgid "Unknown format"
msgstr "不明的標記"
-#: lib/rpmte.c:741
+#: lib/rpmte.c:809
#, fuzzy
msgid "install"
msgstr "(已安裝) "
-#: lib/rpmte.c:742
+#: lib/rpmte.c:810
msgid "erase"
msgstr ""
+#: lib/rpmte.c:840
+#, c-format
+msgid "Failed to expand %%__collection_%s macro\n"
+msgstr ""
+
+#: lib/rpmte.c:861
+#, fuzzy, c-format
+msgid "Failed to open %s: %s\n"
+msgstr "開啟 %s 失敗:%s\n"
+
+#: lib/rpmte.c:869
+#, fuzzy, c-format
+msgid "Failed to resolve symbol: %s\n"
+msgstr "讀取 %s 失敗: %s。\n"
+
+#: lib/rpmte.c:896
+#, fuzzy, c-format
+msgid "Failed to resolve symbol %s: %s\n"
+msgstr "無法將 %s 更名為 %s:%m\n"
+
#: lib/rpmts.c:91
#, c-format
msgid "cannot open Packages database in %s\n"
@@ -2827,7 +2856,7 @@ msgstr "丟失的「)」存在於套件標籤中:%s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s:公鑰讀入失敗。\n"
-#: lib/rpmts.c:980
+#: lib/rpmts.c:984
#, fuzzy
msgid "transaction"
msgstr "建立異動作業集"
@@ -2875,71 +2904,81 @@ msgstr "sigh 填充(%d):不當,讀取 %d 位元組\n"
msgid "sigh sigSize(%zd): BAD, fstat(2) failed\n"
msgstr "sigh sigSize(%d):不當,fstat(2)失敗\n"
-#: lib/signature.c:355
+#: lib/signature.c:333
+#, c-format
+msgid "Unsupported PGP pubkey algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:339
+#, c-format
+msgid "Unsupported PGP hash algorithm %d\n"
+msgstr ""
+
+#: lib/signature.c:378
#, c-format
msgid "Couldn't create pipe for signing: %m"
msgstr ""
-#: lib/signature.c:375 lib/signature.c:661
+#: lib/signature.c:398 lib/signature.c:684
#, c-format
msgid "Could not exec %s: %s\n"
msgstr "無法執行 %s: %s\n"
-#: lib/signature.c:392
+#: lib/signature.c:415
#, c-format
msgid "gpg exec failed (%d)\n"
msgstr "gpg 執行失敗 (%d)\n"
-#: lib/signature.c:398
+#: lib/signature.c:421
msgid "gpg failed to write signature\n"
msgstr "寫入簽名時 gpg 失敗\n"
-#: lib/signature.c:416
+#: lib/signature.c:439
msgid "unable to read the signature\n"
msgstr "無法讀取簽名\n"
-#: lib/signature.c:500
+#: lib/signature.c:523
msgid "Immutable header region could not be read. Corrupted package?\n"
msgstr ""
-#: lib/signature.c:666 lib/signature.c:706
+#: lib/signature.c:689 lib/signature.c:729
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "在巨集檔案中有無效的 %%_signature spec\n"
-#: lib/signature.c:700
+#: lib/signature.c:723
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "您必須在您的巨集檔案中設定 \"%%_gpg_name\"\n"
-#: lib/signature.c:741
+#: lib/signature.c:764
#, fuzzy
msgid "MD5 digest:"
msgstr "MD 5 摘要:"
-#: lib/signature.c:780
+#: lib/signature.c:803
#, fuzzy
msgid "Header SHA1 digest:"
msgstr "表頭 SHA1 摘要:"
-#: lib/signature.c:835
+#: lib/signature.c:858
msgid "Header "
msgstr "表頭 "
-#: lib/signature.c:848
+#: lib/signature.c:871
msgid "Verify signature: BAD PARAMETERS\n"
msgstr "驗證簽名:不當的參數\n"
-#: lib/signature.c:869
+#: lib/signature.c:892
#, c-format
msgid "Signature: UNKNOWN (%d)\n"
msgstr "簽名:不明 (%d)\n"
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1318
+#: lib/transaction.c:1397
#, fuzzy
msgid "failed"
msgstr "%s 失敗:%s\n"
@@ -3344,17 +3383,17 @@ msgstr "警告:"
msgid "memory alloc (%u bytes) returned NULL.\n"
msgstr "記憶體配置 (%u 位元組) 回傳空值。\n"
-#: rpmio/rpmpgp.c:1356
+#: rpmio/rpmpgp.c:1357
#, fuzzy, c-format
msgid "V%d %s/%s %s, key ID %s"
msgstr " DSA 簽名:"
-#: rpmio/rpmpgp.c:1364
+#: rpmio/rpmpgp.c:1365
#, fuzzy
msgid "(none)"
msgstr "(無錯誤)"
-#: rpmio/rpmpgp.c:1635
+#: rpmio/rpmpgp.c:1639
#, fuzzy, c-format
msgid "Failed to register fork handler: %m\n"
msgstr "無法從 %s 讀取規格檔案\n"
@@ -3459,9 +3498,6 @@ msgstr "不驗證表頭+酬載簽名"
#~ msgid "failed to stat %s: %s\n"
#~ msgstr "無法檢驗狀態:%s:%s\n"
-#~ msgid "failed to open %s: %s\n"
-#~ msgstr "開啟 %s 失敗:%s\n"
-
#~ msgid "file %s is on an unknown device\n"
#~ msgstr "檔案 %s 位於一個不明的裝置上\n"
@@ -3649,9 +3685,6 @@ msgstr "不驗證表頭+酬載簽名"
#~ msgid "%s: headerGetEntry failed\n"
#~ msgstr "%s:headerGetEntry 失敗\n"
-#~ msgid "Failed to read %s: %s.\n"
-#~ msgstr "讀取 %s 失敗: %s。\n"
-
#~ msgid "%s expansion failed at %s:%d \"%s\"\n"
#~ msgstr "%s 擴充失敗於 %s:%d \"%s\"\n"