summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2008-03-17 14:27:03 +0200
committerPanu Matilainen <pmatilai@redhat.com>2008-03-17 14:27:03 +0200
commitdb37b74a2bfebf067f421b891d3837baaca7fc6f (patch)
tree72688f309e11737e9cd345f10cf6d90fa83090cb
parentd89482a7c7777d379ab415ebba747b6af19babdb (diff)
downloadrpm-db37b74a2bfebf067f421b891d3837baaca7fc6f.tar.gz
Nuke leftover rollback test program, update translations
-rw-r--r--lib/Makefile.am4
-rw-r--r--po/ca.po515
-rw-r--r--po/cs.po497
-rw-r--r--po/da.po488
-rw-r--r--po/de.po545
-rw-r--r--po/es.po507
-rw-r--r--po/fi.po483
-rw-r--r--po/fr.po516
-rw-r--r--po/is.po469
-rw-r--r--po/it.po506
-rw-r--r--po/ja.po544
-rw-r--r--po/ko.po506
-rw-r--r--po/nb.po499
-rw-r--r--po/pl.po545
-rw-r--r--po/pt.po508
-rw-r--r--po/pt_BR.po569
-rw-r--r--po/rpm.pot459
-rw-r--r--po/ru.po508
-rw-r--r--po/sk.po483
-rw-r--r--po/sl.po483
-rw-r--r--po/sr.po471
-rw-r--r--po/sr@latin.po471
-rw-r--r--po/sv.po544
-rw-r--r--po/tr.po513
-rw-r--r--po/zh_TW.po537
25 files changed, 5283 insertions, 6887 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3184f941c..fd686608e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -40,10 +40,6 @@ check_PROGRAMS += tds
tds_SOURCES = tds.c
tds_LDADD = librpm.la
-check_PROGRAMS += trb
-trb_SOURCES = trb.c
-trb_LDADD = librpm.la
-
check_PROGRAMS += tthread
tthread_SOURCES = tthread.c
tthread_LDADD = librpm.la @WITH_LIBELF_LIB@
diff --git a/po/ca.po b/po/ca.po
index d9207d760..28c35f4fa 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2007-10-13 14:46+0200\n"
"Last-Translator: Catalan <fedora@softcatala.net>\n"
"Language-Team: Catalan <fedora@softcatala.net>\n"
@@ -99,60 +99,60 @@ msgstr "s'ha produït un error en llegir la capçalera del paquet\n"
msgid "cannot re-open payload: %s\n"
msgstr "no s'ha pogut tornar a obrir la càrrega de dades: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Opcions de consulta (amb -q o --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Opcions de verificació (amb -V o --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr "Opcions d'origen (amb --query o --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr "Opcions per recórrer l'arbre de fitxers (amb --ftswalk)"
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Opcions de la signatura:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Opcions de la base de dades:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"Opcions de muntatge amb [ <fitxer d'especificacions> | <arxiu tar> | <paquet "
"font> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Opcions d'instal·lació/actualització/supressió:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "Opcions comunes per a tots els modes d'rpm i executables:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "Versió de l'RPM %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr "Copyright (c) 1998 - 2002 Red Hat, Inc.\n"
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -160,131 +160,131 @@ msgstr ""
"Aquest programari es pot distribuir lliurement d'acord amb els termes de la "
"Llicència Pública General GNU\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "S'ha produït un error intern en el processament d'arguments (%d)\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "només es pot especificar un mode principal"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "només es pot realitzar un tipus de consulta/verificació alhora"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "indicadors inesperats de la consulta"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "format inesperat de la consulta"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "font inesperada de la consulta"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"només es poden imposar la instal·lació, l'actualització, l'rmsource i "
"l'rmspec"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "només es poden reubicar els fitxers durant la instal·lació d'un paquet"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr "no es pot utilitzar l'opció --prefix amb --relocate o --excludepath"
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"només es poden utilitzar les opcions --relocate i --excludepath quan "
"s'estiguin instal·lant paquets nous"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr ""
"només es pot utilitzar l'opció --prefix quan s'estiguin instal·lant paquets "
"nous"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "els arguments a --prefix han de començar amb una /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
"només es pot especificar l'opció --hash (-h) durant la instal·lació d'un "
"paquet"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr ""
"només es pot especificar l'opció --percent durant la instal·lació d'un paquet"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"només es pot especificar l'opció --replacepkgs durant la instal·lació d'un "
"paquet"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr ""
"només es pot especificar l'opció --excludedocs durant la instal·lació d'un "
"paquet"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr ""
"només es pot especificar l'opció --includedocs durant la instal·lació d'un "
"paquet"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "només es pot especificar una opció entre --excludedocs i --includedocs"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr ""
"només es pot especificar l'opció --ignorearch durant la instal·lació d'un "
"paquet"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr ""
"només es pot especificar l'opció --ignoreos durant la instal·lació d'un "
"paquet"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr ""
"només es pot especificar l'opció --ignoresize durant la instal·lació d'un "
"paquet"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"només es pot especificar l'opció --allmatches durant la supressió d'un paquet"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr ""
"només es pot especificar l'opció --allfiles durant la instal·lació d'un "
"paquet"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"només es pot especificar l'opció --justdb durant la instal·lació i supressió "
"d'un paquet"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -292,7 +292,7 @@ msgstr ""
"només es poden especificar les opcions d'inhabilitació d'scripts durant la "
"instal·lació i supressió d'un paquet"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -300,7 +300,7 @@ msgstr ""
"només es poden especificar les opcions d'inhabilitació de l'activador durant "
"la instal·lació i supressió d'un paquet"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -309,7 +309,7 @@ msgstr ""
"reconstrucció, la recompilació, la instal·lació, la supressió i la "
"verificació d'un paquet"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -317,7 +317,7 @@ msgstr ""
"només es pot especificar l'opció --test durant la instal·lació, la supressió "
"i el muntatge d'un paquet"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -325,82 +325,82 @@ msgstr ""
"només es pot especificar l'opció --root (-r) durant la instal·lació, "
"supressió, consulta i reconstrucció d'una base de dades"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "els arguments a --root (-r) han de començar per /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "cap fitxer per signar\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "no s'ha pogut accedir al fitxer %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "no s'ha trobat pgp:"
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Introduïu la contrasenya:"
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "La verificació de la contrasenya ha fallat\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "La contrasenya és correcta.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "L'especificació de %%_signature al fitxer macro no és vàlida.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "només es pot utilitzar l'opció --sign durant el muntatge d'un paquet"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "ha fallat l'execució\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "no s'han donat fitxers de paquets per a reconstruir"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "no s'han donat fitxers d'especificacions per a muntar"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "no s'han donat fitxers tar per a muntar"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "no s'han donat paquets per a suprimir"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "no s'han donat paquets per a instal·lar"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "no s'han donat arguments per a consultar"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "no s'han donat arguments per a verificar"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "no s'han donat arguments"
@@ -617,7 +617,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:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "El glob no ha trobat el fitxer: %s\n"
@@ -786,7 +786,7 @@ msgstr "No es pot tornar a carregar la capçalera de signatura.\n"
msgid "Could not open %s: %s\n"
msgstr "No es pot obrir %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "No es pot escriure el paquet: %s\n"
@@ -1320,17 +1320,17 @@ msgstr ""
"genera les capçaleres de paquets compatibles amb l'antic empaquetament rpm2 "
"i 3"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr ""
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "no verifiquis les capçaleres de la base de dades en obtenir-les"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "no verifiquis les signatures del paquet"
@@ -1372,7 +1372,7 @@ msgstr "genera capçaleres compatibles amb l'empaquetat antic rpm2 i 3"
msgid "Couldn't exec %s: %s\n"
msgstr "No es pot executar %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "No s'ha pogut crear el procés fill de «%s»: %s\n"
@@ -1869,41 +1869,33 @@ msgstr "depura la gestió de la memòria cau d'URL"
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: la taula d'opcions no està ben configurada (%d)\n"
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "els camins exclosos han de començar per /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "les reubicacions han de començar per /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "les reubicacions han de contenir ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "les reubicacions han de tenir un / seguit de ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr "afegeix els paquets suggerits a la transacció"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"instal·la tots els fitxers, fins i tot configuracions que podrien ser "
"ignorades"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1911,156 +1903,152 @@ msgstr ""
"suprimeix tots els paquets que coincideixen amb <paquet> (normalment es "
"genera un error si <paquet> especifica múltiples paquets)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "no executis els scriptlets del paquet"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr "reubica els fitxers en un paquet no reubicable"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr "escriu els bucles de dependències com a avís"
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr "desa els fitxers de paquets suprimits reanomenant-los en subdirectoris"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "suprimeix (desinstal·la) un paquet"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<paquet>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "no instal·lis fitxers de configuració"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "no instal·lis documentació"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "ignora fitxers amb un component inicial <camí> "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<camí>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr "detecta conflictes de fitxers entre paquets"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "abreviatura de --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "actualitza els paquets si ja estan instal·lats"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<fitxerPaquet>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "escriu marques durant la instal·lació de paquets (millor amb -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "no verifiquis l'arquitectura del paquet"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "no verifiquis el sistema operatiu del paquet"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "no comprovis l'espai en disc abans d'instal·lar"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "instal·la documentació"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "instal·la paquets"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "actualitza la base de dades, però no modifiquis el sistema de fitxers"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "no verifiquis les dependències dels paquets"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "no verifiquis l'MD5 dels fitxers"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr "no instal·lis els contexts de seguretat dels fitxers"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"no reordenis la instal·lació dels paquets per a satisfer les dependències"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr "no suggereixis resolucions de dependències fallides"
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "no executis cap scriptlet %%pre"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "no executis cap scriptlet %%post"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "no executis cap scriptlet %%preun"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "no executis cap scriptlet %%postun"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "no executis cap scriptlet invocat per aquest paquet"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "no executis cap scriptlet %%triggerprein"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "no executis cap scriptlet %%triggerin"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "no executis cap scriptlet %%triggerun"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "no executis cap scriptlet %%triggerpostun"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2068,51 +2056,39 @@ msgstr ""
"actualitza a una versió antiga del paquet (--force ho fa automàticament en "
"les actualitzacions)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "escriu els percentatges com a instal·lació de paquets"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "reubica el paquet a <dir>, si és reubicable"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "reubica els fitxers del camí <vell> al <nou>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<vell>=<nou>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "desa els fitxers de paquets suprimits en reempaquetar"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr "ignora els conflictes de fitxers entre paquets"
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "reinstal·la si el paquet ja està present"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<data>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
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:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "actualitza paquets"
@@ -2330,53 +2306,49 @@ msgstr "signa els paquets (igual que --addsign)"
msgid "generate signature"
msgstr "genera la signatura"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "s'espera un paquet de codi font, però s'ha trobat un de binari\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "el paquet font no conté un fitxer .spec\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "Ha fallat l'scriptlet %s(%s-%s-%s.%s), waitpid(%d) rc %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "Ha fallat l'scriptlet %s(%s-%s-%s.%s), el senyal és %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "Ha fallat l'scriptlet %s(%s-%s-%s.%s), l'estat de sortida és %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: l'scriptlet %s ha fallat (%d), s'està ignorant %s\n"
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "No es pot tornar a carregar la capçalera de la signatura\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "ha fallat el desempaquetat de l'arxiu%s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " al fitxer "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "ha fallat %s al fitxer %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "ha fallat %s: %s\n"
@@ -2477,7 +2449,7 @@ msgstr "número de paquet invàlid: %s\n"
msgid "record %lu could not be read\n"
msgstr "el registre %u no es pot llegir\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "no s'ha instal·lat el paquet %s\n"
@@ -2635,8 +2607,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "es poden emprar scripts en lua."
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2647,104 +2619,74 @@ msgstr "ha fallat l'apertura de %s: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "etiqueta desconeguda: «%s»\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Dependències fallides:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "S'està preparant..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "S'està preparant els paquets per a la instal·lació..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "S'està reempaquetant..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr "S'està reempaquetant els fitxer esborrats..."
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "S'està actualitzant..."
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "S'està actualitzant els paquets..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "S'està obtenint %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "s'està ignorant %s - ha fallat la transferència - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "no es pot instal·lar %s\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, c-format
msgid "package %s is not relocatable\n"
msgstr "el paquet %s no és reubicable\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, 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:545
+#: lib/rpminstall.c:507
#, 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:577
+#: lib/rpminstall.c:539
#, c-format
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:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "no es pot obrir el fitxer %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "«%s» especifica paquets múltiples\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "no es pot obrir %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "S'està instal·lant %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr "S'està esborrant els paquets reempaquetats:\n"
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr "\tS'està esborrant %s:\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3096,57 +3038,6 @@ msgstr "Suma MD5 incorrecta: no està disponible\n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signatura: desconeguda (%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-"No s'ha pogut obtenir la instància de l'element d'instal·lació de la base de "
-"dades.\n"
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr "\tS'ha afegit de l'element d'instal·lació %s.\n"
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr "S'ha produït un error en reempaquetar el paquet\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr "No s'ha pogut afegir. No es pot llegir la capçalera de paquet.\n"
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr "No s'ha pogut afegir a rpmpsmStage().\n"
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr "No s'ha pogut afegir. No es pot obtenir la llista de fitxers.\n"
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr "No s'ha pogut suprmir a rpmpsmStage().\n"
-
#: lib/verify.c:274
#, c-format
msgid "missing %c %s"
@@ -3298,145 +3189,145 @@ msgstr ""
msgid "verify database files"
msgstr "verifica els fitxers de la base de dades"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: nom d'etiqueta no reconegut: s'ignorarà «%s»\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "no es pot obrir l'índex de %s emprant db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "no es pot obrir l'índex %s\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "no s'ha establert cap dbpath\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "s'ha produït un error (%d) en obtenir «%s» registres de l'índex %s\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: s'està ignorant"
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "s'ha produït un error (%d) en emmagatzemar el registre #%d a %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: ha fallat l'fseek: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: ha fallat l'apertura: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: s'està ignorant"
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: s'ha obtingut la capçalera #%u malmesa -- s'està ignorant.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: no s'ha pogut llegir la capçalera a 0x%x\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
"error(%d) en establir el registre de la capçalera #%d per a la supressió de %"
"s\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "error(%d) en establir els registres «%s» de l'índex %s\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "error(%d) en emmagatzemar el registre «%s» en %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "error(%d) en suprimir el registre «%s» de %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "error(%d) en assignar la instància de nou paquet\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr "rpmdbAdd: s'està ignorant"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "error(%d) en emmagatzemar el registre %s a %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "no s'ha establert el dbpath"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "ja existeix la base de dades temporal %s\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "no s'ha pogut suprimir el directori %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "la capçalera #%u de la base de dades és incorrecta -- s'ignorarà.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "no es pot afegir el registre originalment a %u\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"no s'ha pogut remuntar la base de dades: es continua fent servir la base de "
"dades original\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "no s'ha pogut reemplaçar la base de dades antiga amb la nova\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "reemplaçeu els fitxers a %s amb fitxers de %s per a recuperar-ho"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "no s'ha pogut suprimir el directori %s: %s\n"
@@ -3681,6 +3572,60 @@ msgstr "%s: ha fallat l'operació de la memòria cau: ec %d.\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: ha fallat la lectura del manifest: %s\n"
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr ""
+#~ "desa els fitxers de paquets suprimits reanomenant-los en subdirectoris"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "desa els fitxers de paquets suprimits en reempaquetar"
+
+#~ msgid "<date>"
+#~ msgstr "<data>"
+
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "No es pot tornar a carregar la capçalera de la signatura\n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "S'està reempaquetant..."
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr "S'està reempaquetant els fitxer esborrats..."
+
+#~ msgid "Upgrading..."
+#~ msgstr "S'està actualitzant..."
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "S'està actualitzant els paquets..."
+
+#~ msgid "Cleaning up repackaged packages:\n"
+#~ msgstr "S'està esborrant els paquets reempaquetats:\n"
+
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "\tS'està esborrant %s:\n"
+
+#~ msgid "Could not get install element database instance!\n"
+#~ msgstr ""
+#~ "No s'ha pogut obtenir la instància de l'element d'instal·lació de la base "
+#~ "de dades.\n"
+
+#~ msgid "\tAdded from install element %s.\n"
+#~ msgstr "\tS'ha afegit de l'element d'instal·lació %s.\n"
+
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "S'ha produït un error en reempaquetar el paquet\n"
+
+#~ msgid "Add failed. Could not read package header.\n"
+#~ msgstr "No s'ha pogut afegir. No es pot llegir la capçalera de paquet.\n"
+
+#~ msgid "Add failed in rpmpsmStage().\n"
+#~ msgstr "No s'ha pogut afegir a rpmpsmStage().\n"
+
+#~ msgid "Add failed. Could not get file list.\n"
+#~ msgstr "No s'ha pogut afegir. No es pot obtenir la llista de fitxers.\n"
+
+#~ msgid "Erase failed failed in rpmpsmStage().\n"
+#~ msgstr "No s'ha pogut suprmir a rpmpsmStage().\n"
+
#, fuzzy
#~ msgid "\texecv(%s) pid %d\n"
#~ msgstr "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
diff --git a/po/cs.po b/po/cs.po
index 5d0e45f53..f780f1c0d 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2001-07-24 10:02+0100\n"
"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -80,168 +80,168 @@ msgstr "chyba pi pi ten hlaviky balku\n"
msgid "cannot re-open payload: %s\n"
msgstr "nemohu znovu otevt payload: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Volby dotaz (s -q or --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Vollby kontroly (s -V or --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
#, fuzzy
msgid "Source options (with --query or --verify):"
msgstr "Vollby kontroly (s -V or --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Volby signatury:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Volby databze:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"Sestavovac volby s [ <spec_soubor> | <tar_soubor> | <zdrojov_balek> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Volby pro Instalaci/Aktualizaci/Mazn:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
#, fuzzy
msgid "Common options for all rpm modes and executables:"
msgstr "Spolen volby pro vechny mdy:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verze %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, fuzzy, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "Tento program lze voln it podle podmnek GNU GPL."
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Intern chyba pi zpracovn parametr (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "specifikovat lze jen jeden hlavn reim"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "najednou lze provst jen jeden typ dotazu i oven"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "neoekvan pznak pro dotaz"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "neoekvan formt dotazu"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "neoekvan zdroj dotazu"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"vynucena me bt jen instalace, aktualizace, smazn zdrojovch kd a spec "
"souboru"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "soubory mohou bt pemstny jen pi instalaci balk"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate a --excludepath je mono pout jen pi instalaci novch balk"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix je mono pout jen pi instalaci novch balk"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "parametry pro --prefix musej zanat znakem /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) me bt pouit jen pi instalaci balk"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent me bt pouit jen pi instalaci balk"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs me bt pouit jen pi instalaci balk"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs me bt pouit jen pi instalaci balk"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs me bt pouit jen pi instalaci balk"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "pout lze jen jeden z parametr --excludedocs a --includedocs"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch me bt pouit jen pi instalaci balk"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos me bt pouit jen pi instalaci balk"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize me bt pouit jen pi instalaci balk"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches me bt pouit jen pi instalaci balk"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles me bt pouit jen pi instalaci balk"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb me bt pouit jen pi instalaci a odstraovn balk"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -249,7 +249,7 @@ msgstr ""
"volba pro potlaen skript me bt pouita jen pi instalaci nebo pi "
"odstraovn balk"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -257,7 +257,7 @@ msgstr ""
"volba pro potlaen trigger me bt pouita jen pi instalaci nebo "
"odstraovn balk"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -265,13 +265,13 @@ msgstr ""
"--nodeps me bt pouit jen pi sestavovn, rekompilaci, instalaci, "
"odstraovn a kontrole"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test me bt pouit jen pi instalaci, odstraovn a sestavovn"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -279,83 +279,83 @@ msgstr ""
"--root (-r) me bt pouit jen pi instalaci, odstraovn, dotazech nebo "
"znovuvytvoen databze"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametry pro --root (-r) musej zanat znakem /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "dn soubory k podepsn\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "pstup k souboru %s se nezdail\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp nenalezeno: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Vlote heslovou frzi: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Chybn heslov frze\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Heslov frze je v podku.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "patn %%_signature spec v souboru maker.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign me bt pouit jen pi sestavovn balk"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "sputn selhalo\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "ke znovusestaven nezadny dn balky"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "pro sestaven nezadny dn spec soubory"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "pro sestaven nezadny dn tar soubory"
-#: rpmqv.c:718
+#: rpmqv.c:715
#, fuzzy
msgid "no packages given for erase"
msgstr "nezadny dn balky pro instalaci"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "nezadny dn balky pro instalaci"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "k dotazu nezadny dn parametry"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "pro kontrolu nezadny dn balky"
-#: rpmqv.c:802
+#: rpmqv.c:792
#, fuzzy
msgid "no arguments given"
msgstr "k dotazu nezadny dn parametry"
@@ -573,7 +573,7 @@ msgstr "Soubor potebuje vodn \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob nen dovolen: %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Soubor nenalezen globem: %s\n"
@@ -743,7 +743,7 @@ msgstr "Nemohu pest hlaviku z %s: %s\n"
msgid "Could not open %s: %s\n"
msgstr "Nemohu otevt %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Nemohu zapsat balek: %s\n"
@@ -1273,19 +1273,19 @@ msgstr "nekontrolovat zvislosti balk"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr "generovat hlaviky balk kompatibiln s RPM verze 2 a 3"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "nekontrolovat zvislosti balk"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
#, fuzzy
msgid "don't verify database header(s) when retrieved"
msgstr "nekontrolovat architekturu balku"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
#, fuzzy
msgid "don't verify package signature(s)"
@@ -1329,7 +1329,7 @@ msgstr "generovat hlaviky balk kompatibiln s RPM verze 2 a 3"
msgid "Couldn't exec %s: %s\n"
msgstr "Nemohu spustit %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Nemohu provst fork %s: %s\n"
@@ -1835,42 +1835,33 @@ msgstr "ladit manipulaci s URL cache"
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "vynechan cesty mus zanat znakem /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "pemstn musej zanat znakem /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "pemstn musej obsahovat ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "pemstn musej mt za znakem = znak /"
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-#, fuzzy
-msgid "malformed rollback time/date stamp argument"
-msgstr "poruen rollback as"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
#, fuzzy
msgid "add suggested packages to transaction"
msgstr "dotaz/oven balk ve skupin"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"nainstalovat vechny soubory i konfigurace, kter by se jinak mohly vynechat"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1878,160 +1869,156 @@ msgstr ""
"odstranit vechny balky odpovdajc <balku> (obvykle se generuje chyba, "
"specifikuje-li <balek> vce balk)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "nespoutt dn skripty uren pro balky"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr "pemstn soubor v nepemstitelnm balku"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr "uchovat smazan soubory pesunem do podadrese"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "smazat (deinstalovat) balek"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<balek>"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr "vypsat vechny konfiguran soubory"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "neinstalovat dokumentaci"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "peskoit soubory s vodn cestou <cesta> "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<cesta>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr "pemstn soubor v nepemstitelnm balku"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "zkratka pro --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "aktualizace balku jestlie je ji nainstalovn"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<soubor_balku>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "bhem instalace balku zobrazit dvojit kky (dobr s -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "nekontrolovat architekturu balku"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "nekontrolovat operan systm balku"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "nekontrolovat voln msto na disku ped instalac"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "nainstalovat dokumentaci"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
#, fuzzy
msgid "install package(s)"
msgstr "nainstalovat balek"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "upravit databzi, ale neupravovat systm souborov"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "nekontrolovat zvislosti balk"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "nekontrolovat MD5 soubor v balku"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
#, fuzzy
msgid "don't install file security contexts"
msgstr "vypsat vechny konfiguran soubory"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr "pro vyeen zvislost nemnit poad instalace balk"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "nespoutt dn skripty (jsou-li njak)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "nespoutt dn skripty (jsou-li njak)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "nespoutt dn skripty (jsou-li njak)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nespoutt dn skripty (jsou-li njak)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nespoutt dn skripty aktivovan tmto balkem"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nespoutt dn skripty uren pro balky"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nespoutt dn instalan skripty"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nespoutt dn instalan skripty"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nespoutt dn instalan skripty"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2039,52 +2026,39 @@ msgstr ""
"aktualizovat na starou verzi balku (--force to dl pi aktualizacch "
"automaticky)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "bhem instalace balku zobrazit procenta"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "pemstit soubory do <adr>, jsou-li pemstiteln"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<adres>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "pemstit soubory ze <star_cesty> do <nov_cesty>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<star_cesta>=<nov_cesta>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "uchovat smazan soubory pomoc pebalen"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "peinstalovat, i kdy je ji balek ptomen"
-#: lib/poptI.c:297
-#, fuzzy
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr "odinstalovat nov balky, reinstalovat star balky zpt do data"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<datum>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr "neinstalovat ale sdlit, zda-li by to fungovalo i nikoli"
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "aktualizace balku"
@@ -2318,54 +2292,49 @@ msgstr "podepsat balek (zahodit aktuln podpis)"
msgid "generate signature"
msgstr "generovat PGP/GPG podpis"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "oekvm balek se zdrojovmi kdy, nalezen vak binrn\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "zdrojov balek neobsahuje .spec soubor\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s: scriptlet %s selhal (%d), peskakuji %s-%s-%s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "proveden %s skripletu z %s-%s-%s selhalo, nvratov kd: %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "proveden %s skripletu z %s-%s-%s selhalo, nvratov kd: %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, fuzzy, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: scriptlet %s selhal (%d), peskakuji %s-%s-%s\n"
-#: lib/psm.c:1581
-#, fuzzy
-msgid "Unable to reload signature header\n"
-msgstr "Nemohu pest hlaviku z %s: %s\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozbalovn archvu selhalo %s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " na souboru "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "nemohu otevt %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s selhalo\n"
@@ -2467,7 +2436,7 @@ msgstr "neplatn slo balku: %s\n"
msgid "record %lu could not be read\n"
msgstr "zznam %u nelze pest\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "balek %s nen nainstalovn\n"
@@ -2620,8 +2589,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "- nen podporovno pro etzce\n"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2632,107 +2601,76 @@ msgstr "oteven %s selhalo: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "neznm znaka"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "chybn zvislosti pi sestavovn:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "nezadny dn balky pro instalaci"
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr ""
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr ""
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr ""
-
-#: lib/rpminstall.c:201
-#, fuzzy
-msgid "Upgrading packages..."
-msgstr "aktualizace balku"
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, fuzzy, c-format
msgid "Retrieving %s\n"
msgstr "RPM verze %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "neinstalovn "
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "cesta %s v balku %s nen pemstiteln"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pi vytven doasnho souboru %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, fuzzy, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "dn balek neaktivuje %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nemohu vytvoit %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "Poloka %s mus bt v balku ptomna: %s\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nemohu vytvoit %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, fuzzy, c-format
msgid "Installing %s\n"
msgstr "dek: %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr "RPM verze %s\n"
-
#: lib/rpmlead.c:100
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
@@ -3090,56 +3028,6 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr "chyba pi pi ten hlaviky balku\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3289,141 +3177,141 @@ msgstr ""
msgid "verify database files"
msgstr "zkontrolovat databzov soubory"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "nemohu otevt RPM databzi v %s\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "nemohu otevt RPM databzi v %s\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "chyba pi vytven doasnho souboru %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek selhal: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: oteven selhalo: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "chyba pi vytven doasnho souboru %s\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "chyba pi vytven doasnho souboru %s\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "chyba pi vytven doasnho souboru %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "chyba pi vytven doasnho souboru %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "Nelze pejmenovat %s na %s: %m\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "Nelze pejmenovat %s na %s: %m\n"
@@ -3675,6 +3563,39 @@ msgstr "%s: oteven selhalo: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
+#, fuzzy
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "poruen rollback as"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr "uchovat smazan soubory pesunem do podadrese"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "uchovat smazan soubory pomoc pebalen"
+
+#, fuzzy
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr "odinstalovat nov balky, reinstalovat star balky zpt do data"
+
+#~ msgid "<date>"
+#~ msgstr "<datum>"
+
+#, fuzzy
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Nemohu pest hlaviku z %s: %s\n"
+
+#, fuzzy
+#~ msgid "Upgrading packages..."
+#~ msgstr "aktualizace balku"
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "RPM verze %s\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "chyba pi pi ten hlaviky balku\n"
+
#~ msgid "========== recording tsort relations\n"
#~ msgstr "========== ukldn tsort relac\n"
diff --git a/po/da.po b/po/da.po
index 02f4a88a2..c57d34a99 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\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"
@@ -81,178 +81,178 @@ msgstr "fejl ved lsning af hovedet p pakke\n"
msgid "cannot re-open payload: %s\n"
msgstr "kan ikke genbne pakkeindhold: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Foresprgselstilvalg (med -q eller --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Verifikationstilvalg (med -V eller --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
#, fuzzy
msgid "Source options (with --query or --verify):"
msgstr "Verifikationstilvalg (med -V eller --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Signaturtilvalg"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Databasetilvalg:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Opbygningstilvalg med [ <spec-fil> | <tararkiv> | <kildepakke> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
#, fuzzy
msgid "Common options for all rpm modes and executables:"
msgstr "Flles tilvalg for alle rpm-tilstande:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "fil %s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, fuzzy, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "Dette program kan frit distribueres under betingelserne i GNU GPL"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "kun t hovedtilvalg kan angives"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "kun n af foresprgsel/verificr kan udfres ad gangen"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "uventet foresprgselsflag"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "uventet foresprgselsformat"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "uventet foresprgselskilde"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "kun installation, opgradering, rmsource og rmspec kan tvinges igennem"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "filer kan kun omrokeres under installation"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate og --excludepath kan kun bruges, nr nye pakker installeres"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan kun bruges, nr nye pakker installeres"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "parametre til --prefix skal starte med et /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan kun angives ved installation"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent kan kun angives ved installation"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs kan kun angives ved installation"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs kan kun angives ved installation"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs kan kun angives ved installation"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "kun n af --excludedocs og --includedocs kan angives"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch kan kun angives ved installation"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos kan kun angives ved installation"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize kan kun angives ved installation"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches kan kun angives ved installation"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles kan kun angives ved installation"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb kan kun angives ved installation og sletning"
-#: rpmqv.c:469
+#: rpmqv.c:467
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb kan kun angives ved installation og sletning"
-#: rpmqv.c:474
+#: rpmqv.c:472
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--notriggers kan kun angives ved installation og sletning af pakker"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -260,13 +260,13 @@ msgstr ""
"--nodeps kan kun angives ved opbygning, genopbygning, genoversttelse, "
"installation, sletning og verifikation"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test kan kun angives ved installation, sletning og opbygning"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -274,83 +274,83 @@ msgstr ""
"--root (-r) kan kun angives ved installation, sletning, foresprgsel og "
"genopbygning af databasen"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "parameteren til --root (-r) skal starte med et /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "ingen filer at underskrive\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "kan ikke tilg filen %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp ikke fundet: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Indtast adgangskode: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Adgangskode ikke godkendt\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Adgangskode godkendt.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Ugyldig angivelse af %%_signature i makrofil.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign kan kun bruges ved pakkeopbygning"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "eksekvering mislykkedes\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler angivet til genopbygning"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "ingen spec-fil angivet til opbygning"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "ingen tar-arkiver angivet til opbygning"
-#: rpmqv.c:718
+#: rpmqv.c:715
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker angivet ved installation"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "ingen pakker angivet ved installation"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "ingen parametre angivet ved foresprgsel"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "ingen parametre angivet ved verifikation"
-#: rpmqv.c:802
+#: rpmqv.c:792
#, fuzzy
msgid "no arguments given"
msgstr "ingen parametre angivet ved foresprgsel"
@@ -568,7 +568,7 @@ msgstr "Fil krver foranstillet \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "linie %d: Filnavn ikke tilladt: %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Fil ikke fundet med glob: %s\n"
@@ -740,7 +740,7 @@ msgstr "Kunne ikke lse hoved fra %s: %s\n"
msgid "Could not open %s: %s\n"
msgstr "Kunne ikke bne %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Kunne ikke skrive pakke: %s\n"
@@ -1273,19 +1273,19 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
"generr pakkehoved(er), der er kompatible med (gamle) rpm[23]-indpakninger"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "undlad at tjekke pakkers afhngighedskrav"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
#, fuzzy
msgid "don't verify database header(s) when retrieved"
msgstr "tjek ikke pakkens arkitektur"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
#, fuzzy
msgid "don't verify package signature(s)"
@@ -1329,7 +1329,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Kunne ikke udfre %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Kunne ikke fraspalte ny proces til %s: %s\n"
@@ -1834,42 +1834,34 @@ msgstr "aflus URL-bufferhndtering"
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "udeladte stier skal begynde med et /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "omrokeringer skal starte med et /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "omrokeringer skal indeholde et ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "i omrokeringer skal = efterflges af /"
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
#, fuzzy
msgid "add suggested packages to transaction"
msgstr "foresprg/verificr pakke(r) i gruppen"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"installr alle filer -- ogs konfigurationsfiler, der ellers skulle "
"overspringes"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1877,166 +1869,162 @@ msgstr ""
"fjern alle pakker, som passer med <pakke> (normalt ville det medfre en "
"fejl, hvis <pakke> angav flere pakker)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "udfr ingen pakkespecifikke skripter"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr "omdirigr filer i ikke-omdirigrbar pakke"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "slet (afinstallr) pakke"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
#, fuzzy
msgid "<package>+"
msgstr "<pakke>"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr "vis alle konfigurationsfiler"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "installr ikke dokumentation"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "overspring filer med foranstillet komponent <sti> "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr "omdirigr filer i ikke-omdirigrbar pakke"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "forkortelse for --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "opgradr pakke, hvis den allerede er installeret"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<pakkefil>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "udls #'er efterhnden som pakken installeres (virker sammen med -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "tjek ikke pakkens arkitektur"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "tjek ikke pakkens operativsystem"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "tjek ikke om der er diskplads, fr der installeres"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "installr dokumentation"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
#, fuzzy
msgid "install package(s)"
msgstr "installr pakke"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "opdatr databasen, men rr ikke filsystemet"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "undlad at tjekke pakkers afhngighedskrav"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "verificr ikke filerne i pakke"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
#, fuzzy
msgid "don't install file security contexts"
msgstr "vis alle konfigurationsfiler"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"ndr ikke pakkernes installationsrkkeflge for at opfylde afhngigheder"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "udfr ikke eventuelle skripter"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "udfr ikke eventuelle skripter"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "udfr ikke eventuelle skripter"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "udfr ikke eventuelle skripter"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "udfr ikke smskripter, der mtte udlses af denne pakke"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "udfr ingen pakkespecifikke skripter"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "udfr ingen installations-smskripter"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "udfr ingen installations-smskripter"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "udfr ingen installations-smskripter"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2044,53 +2032,41 @@ msgstr ""
"opgradr til en ldre version af pakken (--force gr ikke dette automatisk "
"ved opgraderinger)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "vis procenter efterhnden som pakken installeres"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "omdirigr pakken til <katalog>, hvis omdirigrbar"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<katalog>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "omdirigr filer fra <gammelsti> til <nysti>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
#, fuzzy
msgid "<old>=<new>"
msgstr "<gammelsti>=<nysti>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr ""
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "geninstallr hvis pakken allerede er installeret"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr ""
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
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:303
+#: lib/poptI.c:278
#, fuzzy
msgid "upgrade package(s)"
msgstr "opgradr pakke"
@@ -2332,56 +2308,51 @@ msgstr "underskriv en pakke (slet nuvrende signatur)"
msgid "generate signature"
msgstr "generr PGP/GPG-signatur"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "kildepakke forventet, binr fundet\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "kildepakke indeholder ingen .spec-fil\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "overspringer installation af %s-%s-%s, %%pre-smskript fejlede rc %d\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr ""
"krsel af smskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr ""
"krsel af smskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1581
-#, fuzzy
-msgid "Unable to reload signature header\n"
-msgstr "Kunne ikke lse hoved fra %s: %s\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " for fil "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "kunne ikke bne %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s mislykkedes\n"
@@ -2483,7 +2454,7 @@ msgstr "ugyldigt pakkenummer: %s\n"
msgid "record %lu could not be read\n"
msgstr "post %d kunne ikke lses\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "pakken %s er ikke installeret\n"
@@ -2636,8 +2607,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "- understttes ikke for strenge\n"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2648,108 +2619,75 @@ msgstr "bning af %s mislykkedes %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "ukendt mrke"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "afhngighedskrav, der ikke kunne imdekommes:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "Forbereder..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker til installation..."
-#: lib/rpminstall.c:178
-#, fuzzy
-msgid "Repackaging..."
-msgstr "Forbereder..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr ""
-
-#: lib/rpminstall.c:199
-#, fuzzy
-msgid "Upgrading..."
-msgstr "Forbereder..."
-
-#: lib/rpminstall.c:201
-#, fuzzy
-msgid "Upgrading packages..."
-msgstr "opgradr pakke"
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Modtager %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "overspringer %s - overfrsel mislykkedes - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kunne ikke installeres\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "pakke %s kan ikke omrokeres\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "fejl ved lsning fra filen %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, 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:577
+#: lib/rpminstall.c:539
#, fuzzy, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "ingen pakker udlser %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kunne ikke bne fil %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" angiver flere pakker\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kunne ikke bne %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr "Modtager %s\n"
-
#: lib/rpmlead.c:100
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
@@ -3106,56 +3044,6 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signaturfyld : %d\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr "fejl ved lsning af hovedet p pakke\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3307,141 +3195,141 @@ msgstr "genopbyg omvendte databaselister ud fra installerede pakkehoveder"
msgid "verify database files"
msgstr "foresprg en spec-fil"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: ukendt mrkenavn: \"%s\" ignoreret\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "kan ikke bne '%s'-indeks ved brug af db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "kan ikke bne '%s'-indeks\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "der er ikke sat nogen dbpath\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "fejl(%d) ved gemning af post %s i %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: bning mislykkedes: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: kan ikke lse hoved ved 0x%x\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "fejl(%d) ved gemning af post %s i %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "fejl(%d) ved fjernelse af post %s fra %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "fejl(%d) under allokering af ny pakkeinstans\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "fejl(%d) ved gemning af post %s i %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "der ikke sat nogen dbpath"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "den midlertidige database %s eksisterer allerede\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "kunne ikke fjerne katalog %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, fuzzy, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "post nummer %d i databasen er fejlbehftet -- overspringer.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "kunne ikke tilfje posten, der tidligere var ved %d\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "kunne ikke erstatte gammel database med ny database!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "erstat filer i %s med filer fra %s for at genoprette"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunne ikke fjerne katalog %s: %s\n"
@@ -3690,6 +3578,30 @@ msgstr "%s: bning mislykkedes: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: ls manifest mislykkedes: %s\n"
+#, fuzzy
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Kunne ikke lse hoved fra %s: %s\n"
+
+#, fuzzy
+#~ msgid "Repackaging..."
+#~ msgstr "Forbereder..."
+
+#, fuzzy
+#~ msgid "Upgrading..."
+#~ msgstr "Forbereder..."
+
+#, fuzzy
+#~ msgid "Upgrading packages..."
+#~ msgstr "opgradr pakke"
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "Modtager %s\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "fejl ved lsning af hovedet p pakke\n"
+
#~ msgid "========== recording tsort relations\n"
#~ msgstr "========== gemmer tsort-relationer\n"
diff --git a/po/de.po b/po/de.po
index ba7d98d3b..760a5fdf5 100644
--- a/po/de.po
+++ b/po/de.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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2005-07-08 17:21+0200\n"
"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
"Language-Team: German <de@li.org>\n"
@@ -85,59 +85,59 @@ msgstr "Fehler beim Lesen des Paket-Headers\n"
msgid "cannot re-open payload: %s\n"
msgstr "Kann Nutzdaten nicht erneut öffnen: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Abfrage-Optionen (mit -q oder --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Überprüfungsoptionen (mit -V oder --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr "Quell-Optionen (mit --query oder --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr "Optionen zum Durchlaufen des Dateibaumes (mit --ftswalk):"
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Signatur-Optionen:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Datenbank-Optionen:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"Erstellungsoptionen mit [ <Spec-Datei> | <Tar-Archiv> | <Source-Paket> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Installations-/Aktualisierungs-/Deinstallationsoptionen:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "Gemeinsame Optionen für alle RPM-Modi und Ausführungen:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM, Version %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -145,115 +145,115 @@ msgstr ""
"Dieses Programm darf unter den Bedingungen der GNU GPL frei weiterverbreitet "
"werden\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Interner Fehler beim Verarbeiten der Argumente (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "Nur ein wichtiger Modus kann angegeben werden"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr ""
"Nur eine Art von Abfragen/Überprüfungen kann jeweils durchgeführt werden"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "Unerwartete Abfrage-Parameter"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "Unerwartetes Abfrage-Format"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "Unerwartete Abfrage-Quelle"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"Nur Installation, Aktualisierung, \"rmsource\" und \"rmspec\" können "
"erzwungen werden"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "Dateien können nur bei der Paket-Installation verschoben werden"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
"--prefix kann nicht zusammen mit --relocate oder --excludepath verwendet "
"werden"
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate und --excludepath dürfen nur bei der Installation neuer Pakete "
"benutzt werden"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "Argumente für --prefix müssen mit einem / beginnen"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) darf nur während der Paket-Installation angegeben werden"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent darf nur während der Paket-Installation angegeben werden"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs darf nur während der Paket-Installation angegeben werden"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs darf nur während der Paket-Installation angegeben werden"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs darf nur während der Paket-Installation angegeben werden"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "entweder --excludedocs oder --includedocs darf angegeben werden"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch darf nur während der Paket-Installation angegeben werden"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos darf nur während der Paket-Installation angegeben werden"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize darf nur während der Paket-Installation angegeben werden"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--allmatches darf nur während der Paket-Deinstallation angegeben werden"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles darf nur während der Paket-Installation angegeben werden"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb darf nur während der Paket-Installation oder -Deinstallation "
"angegeben werden"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -261,7 +261,7 @@ msgstr ""
"Optionen zum Deaktivieren von Skripten können nur während der Paket-"
"Installation oder -Deinstallation angegeben werden"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -269,7 +269,7 @@ msgstr ""
"Optionen zum Deaktivieren von Trigger können nur während der Paket-"
"Installation oder -Deinstallation angegeben werden"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -277,7 +277,7 @@ msgstr ""
"--nodeps darf nur während der Paket-Installation, -Deinstallation, -"
"Überprüfung und -Erstellung angegeben werden"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -285,7 +285,7 @@ msgstr ""
"--test darf nur während der Paket-Installation, -Deinstallation und -"
"Erstellung angegeben werden"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -293,82 +293,82 @@ msgstr ""
"--root (-r) darf nur während der Paket-Installation, -Deinstallation, -"
"Abfragen und während Datenbank-Neuerstellungen angegeben werden"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "Argumente für --root (-r) müssen mit einem / beginnen"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "Keine Dateien zu signieren\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "Kann auf die Datei %s nicht zugreifen\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "PGP nicht gefunden: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Bitte das Passwort eingeben: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Die Passwort-Überprüfung ist fehlgeschlagen\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Das Passwort ist richtig.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Ungültige %%_signature in der Makro-Datei.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign darf nur während der Paket-Erstellung benutzt werden"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "Ausführung fehlgeschlagen\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "Es wurden keine Paket-Dateien für die Neuerstellung angegeben"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "Es wurde keine Spec-Datei für die Erstellung angegeben"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "Es wurde keine Tar-Datei für die Erstellung angegeben"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "Es wurden keine Argumente für die Abfrage angegeben"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "Es wurden keine Argumente angegeben"
@@ -585,7 +585,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:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Datei von \"glob\" nicht gefunden: %s\n"
@@ -754,7 +754,7 @@ msgstr "Kann den Header der Signatur nicht erneut laden.\n"
msgid "Could not open %s: %s\n"
msgstr "Konnte %s nicht öffnen: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Kann das Paket nicht schreiben: %s\n"
@@ -1291,17 +1291,17 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
"Generiere Paket-Header, die mit veralteten RPM-Paketen (v2/3) kompatibel sind"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "Paket-Kurzfassung nicht überprüfen"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "Datenbank-Header beim Abrufen nicht überprüfen"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "Paket-Signatur(en) nicht überprüfen"
@@ -1344,7 +1344,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Konnte %s nicht ausführen: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Konnte fork %s nicht ausführen: %s\n"
@@ -1834,41 +1834,33 @@ msgstr "Debugge Zwischenspeicher-Verwaltung der URLs"
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: Optionstabelle ist falsch konfiguriert (%d)\n"
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "Ausgeschlossene Pfade müssen mit einem / beginnen"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "Verschiebungen müssen mit einem / beginnen"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "Verschiebungen müssen ein = enthalten"
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "Verschiebungen müssen einen / nach dem = enthalten"
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr "Rollback benötigt einen Datums-/Zeitstempel als Argument"
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr "Missgebildeter Datums-/Zeitstempel für ein Rollback"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr "Füge vorgeschlagene Pakete zur Transaktion hinzu"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"Installiere alle Dateien, sogar Konfigurationsdateien, die sonst "
"möglicherweise übersprungen werden"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1876,156 +1868,152 @@ msgstr ""
"Entferne alle Pakete, die mit <Paket> übereinstimmen (normalerweise wird "
"eine Fehlermeldung angezeigt, wenn <Paket> auf mehrere Pakete zutrifft)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "Keine Paket-Skriptlets ausführen"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr "Verschiebe Dateien eines nicht verschiebbaren Pakets"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr "Zeige Abhängigkeitsschleifen als Warnung"
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr "Gelöschte Paket-Dateien durch umbenennen im Unterverzeichnis sichern"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "Lösche (deinstalliere) Paket"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<Paket>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "Installiere keine Konfigurationsdateien"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "Installiere keine Dokumentation"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "Überspringe Dateien mit beginnendem <Pfad> "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<Pfad>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr "Erkenne Datei-Konflikte zwischen Paketen"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "Abkürzung für --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "Aktualisiere Paket(e), wenn bereits installiert"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<Paket-Datei>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "Zeige Rautezeichen während der Installation (empfehlenswert mit -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "Keine Überprüfung der Paket-Architektur"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "Keine Überprüfung des Paket-Betriebssystems"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "Keine Überprüfung des Festplattenspeichers vor der Installation"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "Installiere Dokumentation"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "Installiere Paket(e)"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "Aktualisiere die Datenbank, aber verändere nichts im Dateisystem"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "Keine Überprüfung der Paket-Abhängigkeiten"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "Keine Überprüfung der MD5-Kurzfassung der Dateien"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr "Installiere keine Sicherheitskontext-Dateien"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"Paket-Installation nicht neu sortieren, um die Abhängigkeiten zu erfüllen"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr "Keine Vorschläge für fehlende Abhängigkeitsauflösungen"
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "%%pre-Skriptlet nicht ausführen (wenn vorhanden)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "%%post-Skriptlet nicht ausführen (wenn vorhanden)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "%%preun-Skriptlet nicht ausführen (wenn vorhanden)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun-Skriptlet nicht ausführen (wenn vorhanden)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "Keine Skriptlets dieses Pakets ausführen"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "%%triggerprein-Skriptlets nicht ausführen"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "%%triggerin-Skriptlets nicht ausführen"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "%%triggerun-Skriptlets nicht ausführen"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "%%triggerpostun-Skriptlets nicht ausführen"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2033,54 +2021,41 @@ msgstr ""
"Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
"Aktualisierungen automatisch)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "Zeige Prozentangabe bei der Paket-Installation"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis "
"<Verzeichnis>"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<Verzeichnis>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "verschiebe Dateien von <alter Pfad> nach <neuer Pfad>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<alter Pfad>=<neuer Pfad>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "Sichern der gelöschten Paket-Dateien durch erneutes Bauen des Pakets"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr "Ignore Datei-Konflikte zwischen Paketen"
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "Installiere erneut, wenn das Paket bereits vorhanden ist"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-"Deinstalliere neue(s), installiere alte(s) Paket(e), zurück zum <Datum>"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<Datum>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
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:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "Paket(e) aktualisieren"
@@ -2295,53 +2270,49 @@ msgstr "Signiere Paket(e) (identisch mit --addsign)"
msgid "generate signature"
msgstr "Erzeuge Signatur"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "Source-Paket erwartet, Binär-Paket entdeckt\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "Source-Paket enthält keine Spec-Datei\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s(%s-%s-%s.%s) Skriptlet fehlgeschlagen, waitpid(%d), rc %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s(%s-%s-%s.%s) Skriptlet fehlgeschlagen, Signal %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "%s(%s-%s-%s.%s) Skriptlet fehlgeschlagen, Beenden-Status %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: %s Skriptlet fehlgeschlagen (%d), überspringe %s\n"
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "Kann den Header der Signatur nicht erneut laden\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "Entpacken des Archivs fehlgeschlagen%s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " bei Datei "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s fehlgeschlagen bei Datei %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s fehlgeschlagen: %s\n"
@@ -2442,7 +2413,7 @@ msgstr "Ungültige Paket-Nummer: %s\n"
msgid "record %lu could not be read\n"
msgstr "Eintrag %u konnte nicht gelesen werden\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "Das Paket %s ist nicht installiert\n"
@@ -2598,8 +2569,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "Interne Unterstützung für LUA-Skripte"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2610,104 +2581,74 @@ msgstr "Öffnen von %s fehlgeschlagen: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "Unbekannter Tag: \"%s\"\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Fehlgeschlagende Abhängigkeiten:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "Vorbereiten..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Vorbereiten der Pakete für die Installation..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "Erneut packen..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr "Erneutes packen gelöschter Dateien..."
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "Aktualisiere..."
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "Aktualisiere Pakete..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Empfange %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "überspringe %s - Übertragung fehlgeschlagen - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kann nicht installiert werden\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, c-format
msgid "package %s is not relocatable\n"
msgstr "Paket %s ist nicht verschiebbar\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "Fehler beim Lesen von Datei %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, 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:577
+#: lib/rpminstall.c:539
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: Kein RPM-Paket (oder Paket-Liste): %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "Kann Datei %s nicht öffnen: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" bezeichnet mehrere Pakete\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "Kann %s nicht öffnen: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Installiere %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr "Rollback-Pakete (+%d/-%d) bis %-24.24s (0x%08x):\n"
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr "Aufräumen bei neu gebauten Paketen:\n"
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr "\tEntferne %s:\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3059,57 +3000,6 @@ msgstr "Fehlerhafte MD5-Kurzfassung: NICHT UNTERSTÜTZT\n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signatur: UNBEKANNT (%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr "Transaktion fehlgeschlagen...mache Rollback\n"
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr "Konnte Auto-Rollback-Transaktion nicht sortieren!\n"
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr "Keine Datenbank-Instanz des Installationselements!\n"
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr "Keine Header der Transaktion für das Auto-Rollback!\n"
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr "\tVom Installationselement %s hinzugefügt.\n"
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr "Kein erneut gepackter Header für Transaktion des Auto-Rollbacks!\n"
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-"Konnte das Deinstallationselement für Transaktion des Auto-Rollbacks nicht "
-"hinzufügen.\n"
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr "Fehler beim Lesen des erneut gepackten Pakets!\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr "Hinzufügen fehlgeschlagen. Konnte den Paket-Header nicht lesen.\n"
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr "Hinzufügen fehlgeschlagen bei rpmpsmStage().\n"
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr "Hinzufügen fehlgeschlagen. Konnte keine Dateiliste bekommen.\n"
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr "Löschen fehlgeschlagen bei rpmpsmStage().\n"
-
#: lib/verify.c:274
#, c-format
msgid "missing %c %s"
@@ -3258,142 +3148,142 @@ msgstr ""
msgid "verify database files"
msgstr "Überprüfe Datenbank-Dateien"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: Unbekannter Tag-Name: \"%s\" ignoriert\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "Kann den %s-Index nicht öffnen, benutze db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "Kann den %s-Index nicht öffnen\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "Kein Datenbank-Pfad wurde gesetzt\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "Fehler(%d) beim Lesen \"%s\"-Einträgen des %s-Indexes\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: Überspringe"
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "Fehler(%d) beim Speichern des Eintrags #%d in %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek fehlgeschlagen: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: Öffnen fehlgeschlagen: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: Überspringe"
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: Beschädigten Header #%u erhalten -- überspringe.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: Kann den Header bei 0x%x nicht lesen\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "Fehler(%d) beim Markieren des Header-Eintrags #%d zur %s Entfernung\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "Fehler(%d) beim Setzen von \"%s\"-Einträgen des %s-Indexes\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "Fehler(%d) beim Speichern des Eintrags \"%s\" in %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "Fehler(%d) beim Entfernen des Eintrags \"%s\" aus %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "Fehler(%d) beim Reservieren einer neuen Paket-Instanz\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr "rpmdbAdd: Überspringe"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "Fehler(%d) beim Speichern des Eintrags %s in %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "Kein Datenbank-Pfad wurde gesetzt"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "Temporäre Datenbank %s existiert bereits\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "Entfernen des Verzeichnisses %s fehlgeschlagen: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "Header #%u in der Datenbank ist ungültig -- überspringe.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "Kann ursprünglichen Eintrag %u nicht hinzufügen\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"Neu bauen der Datenbank fehlgeschlagen: Datenbank verbleibt entsprechend\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "Konnte die alte Datenbank nicht durch die neue ersetzen!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "Ersetze Dateien in %s mit Dateien aus %s für eine Wiederherstellung"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "Entfernen des Verzeichnisses %s fehlgeschlagen: %s\n"
@@ -3636,6 +3526,89 @@ msgstr "%s: Cache-Operation(en) fehlgeschlagen: Fehler-Code %d.\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: Lesen der Paket-Liste fehlgeschlagen: %s\n"
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr "Rollback benötigt einen Datums-/Zeitstempel als Argument"
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "Missgebildeter Datums-/Zeitstempel für ein Rollback"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr ""
+#~ "Gelöschte Paket-Dateien durch umbenennen im Unterverzeichnis sichern"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr ""
+#~ "Sichern der gelöschten Paket-Dateien durch erneutes Bauen des Pakets"
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr ""
+#~ "Deinstalliere neue(s), installiere alte(s) Paket(e), zurück zum <Datum>"
+
+#~ msgid "<date>"
+#~ msgstr "<Datum>"
+
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Kann den Header der Signatur nicht erneut laden\n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "Erneut packen..."
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr "Erneutes packen gelöschter Dateien..."
+
+#~ msgid "Upgrading..."
+#~ msgstr "Aktualisiere..."
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "Aktualisiere Pakete..."
+
+#~ msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
+#~ msgstr "Rollback-Pakete (+%d/-%d) bis %-24.24s (0x%08x):\n"
+
+#~ msgid "Cleaning up repackaged packages:\n"
+#~ msgstr "Aufräumen bei neu gebauten Paketen:\n"
+
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "\tEntferne %s:\n"
+
+#~ msgid "Transaction failed...rolling back\n"
+#~ msgstr "Transaktion fehlgeschlagen...mache Rollback\n"
+
+#~ msgid "Could not order auto-rollback transaction!\n"
+#~ msgstr "Konnte Auto-Rollback-Transaktion nicht sortieren!\n"
+
+#~ msgid "Could not get install element database instance!\n"
+#~ msgstr "Keine Datenbank-Instanz des Installationselements!\n"
+
+#~ msgid "Could not get header for auto-rollback transaction!\n"
+#~ msgstr "Keine Header der Transaktion für das Auto-Rollback!\n"
+
+#~ msgid "\tAdded from install element %s.\n"
+#~ msgstr "\tVom Installationselement %s hinzugefügt.\n"
+
+#~ msgid "Could not get repackaged header for auto-rollback transaction!\n"
+#~ msgstr "Kein erneut gepackter Header für Transaktion des Auto-Rollbacks!\n"
+
+#~ msgid "Could not add erase element to auto-rollback transaction.\n"
+#~ msgstr ""
+#~ "Konnte das Deinstallationselement für Transaktion des Auto-Rollbacks "
+#~ "nicht hinzufügen.\n"
+
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "Fehler beim Lesen des erneut gepackten Pakets!\n"
+
+#~ msgid "Add failed. Could not read package header.\n"
+#~ msgstr "Hinzufügen fehlgeschlagen. Konnte den Paket-Header nicht lesen.\n"
+
+#~ msgid "Add failed in rpmpsmStage().\n"
+#~ msgstr "Hinzufügen fehlgeschlagen bei rpmpsmStage().\n"
+
+#~ msgid "Add failed. Could not get file list.\n"
+#~ msgstr "Hinzufügen fehlgeschlagen. Konnte keine Dateiliste bekommen.\n"
+
+#~ msgid "Erase failed failed in rpmpsmStage().\n"
+#~ msgstr "Löschen fehlgeschlagen bei rpmpsmStage().\n"
+
#~ msgid " Obsoletes: %s\t\terases %s\n"
#~ msgstr " Veraltetes: %s\t\tDeinstallationen %s\n"
diff --git a/po/es.po b/po/es.po
index ed9149192..25fd5558d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2006-04-28 09:52+1000\n"
"Last-Translator: Manuel Ospina <mospina@redhat.com>\n"
"Language-Team: Spanish <en@li.org>\n"
@@ -84,60 +84,60 @@ msgstr "error al leer cabecera del paquete\n"
msgid "cannot re-open payload: %s\n"
msgstr "no se puede abrir el contenido (payload): %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Opciones de consulta (con -q o --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Opciones de verificación (con -V o --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
#, fuzzy
msgid "Source options (with --query or --verify):"
msgstr "Opciones de verificación (con -V o --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Opciones de firma:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Opciones de base de datos:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"Opciones de construcción con [ <specfile> | <tarball> | <paquete fuente> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Opciones de Instalación/Actualización/Remoción:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "Opciones comunes para todos los modos y ejecutables:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versión %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -145,120 +145,120 @@ msgstr ""
"Este programa puede ser redistribuido libremente bajo los términos de la "
"licencia GNU GPL\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Error interno en el procesamiento de argumentos (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "solo puede especificarse un modo principal"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "un tipo de consulta/verificación puede ser ejecutado cada vez"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "opciones de consulta inesperadas"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "formato de consulta inesperado"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "fuente de consulta inesperado"
-#: rpmqv.c:401
+#: rpmqv.c:399
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"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr ""
"los archivos solo pueden ser reubicados durante la instalación de paquetes"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate y --excludepath solo pueden ser usados al instalar nuevos paquetes"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix solo puede ser usado al instalar nuevos paquetes"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "los argumentos de --prefix deber iniciar con /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) solo puede ser usado durante la instalación de paquetes"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr ""
"--percent solo puede ser especificado durante la instalación de paquetes"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs solo puede ser especificado durante la instalación de paquetes"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr ""
"--excludedocs solo puede ser especificado durante la instalación de paquetes"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr ""
"--includedocs solo puede ser especificado durante la instalación de paquetes"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "solo se puede especificar una opción: --excludedocs o --includedocs"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr ""
"--ignorearch solo puede ser especificado durante la instalación de paquetes"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr ""
"--ignoreos solo puede ser especificado durante la instalación de paquetes"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr ""
"--ignoresize solo puede ser especificado durante la instalación de paquetes"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--allmatches solo puede ser especificado durante la remoción de paquetes"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr ""
"--allfiles solo puede ser especificado durante la instalación de paquetes"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb solo puede ser especificado durante la instalación y remoción de "
"paquetes"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -266,7 +266,7 @@ msgstr ""
"las opciones de desactivación de script solo pueden ser especificadas "
"durante la instalación o eliminación del paquete."
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -274,7 +274,7 @@ msgstr ""
"las opciones de desactivación de detonante solo pueden ser especificadas "
"durante la instalación y borrado de paquetes"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -283,7 +283,7 @@ msgstr ""
"reconstrucción, recompilación, instalación, remoción y verificación de "
"paquetes"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -291,7 +291,7 @@ msgstr ""
"--test solo puede ser especificado durante la instalación, remoción y "
"construcción de paquetes"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -299,82 +299,82 @@ msgstr ""
"--root (-r) solo puede ser especificado durante la consulta, base de datos, "
"instalación y remoción de paquetes"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "los argumentos de --root (-r) deben iniciar con /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "ningún archivo para firmar\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "no se puede acceder al archivo %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "no se encontró la pgp:"
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Introduzca la contraseña:"
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Falló la verificación de la frase secreta\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "La frase secreta es correcta\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "%%_signature spec no válido en el archivo macro.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign solo puede ser utilizado durante la construcción de paquetes"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "ejecución fallida\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "ningún paquete dado para la reconstrucción"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "ningún archivo spec dado para la construcción"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "ningún archivo tar dado para la construcción"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "ningún paquete dado para la remoción"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "ningún paquete dado para la instalación"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "ningún argumento dado para la consulta"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "ningún argumento dado para la verificación"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "ningún argumento dado"
@@ -591,7 +591,7 @@ msgstr "El archivo necesita \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob no está permitido: %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "glob no encontró el archivo: %s\n"
@@ -760,7 +760,7 @@ msgstr "Incapaz de recargar cabecera de firma\n"
msgid "Could not open %s: %s\n"
msgstr "No se pudo abrir %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Incapaz de abrir paquete: %s\n"
@@ -1298,17 +1298,17 @@ msgstr ""
"generar cabeceras de paquetes compatibles con el empaquetamiento rpm[23] "
"(legado)"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "no verificar resumen del paquete(s)"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "no verificar cabeceras de paquetes al recuperar"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "no verificar firma(s) del paquete"
@@ -1350,7 +1350,7 @@ msgstr "generar encabezados compatibles con empaquetados rpm[23] (de legado)"
msgid "Couldn't exec %s: %s\n"
msgstr "No se pudo ejecutar %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "No se pudo bifurcar %s: %s\n"
@@ -1854,42 +1854,34 @@ msgstr "depurar manipulación del caché URL"
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: misconfiguración de la opción table (%d)\n"
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "rutas de exclusión deben iniciar con un /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "realocaciones deben iniciar con un /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "realocaciones deben contener un ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "realocaciones deben tener un / después de ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr "la restauración recibe un argumento de etiqueta de hora/fecha"
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr "argumento de etiqueta hora/fecha mal formado"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
#, fuzzy
msgid "add suggested packages to transaction"
msgstr "consultar/verificar paquete(s) de la transacción de la instalación"
-#: lib/poptI.c:147
+#: 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 los cuales serían "
"saltados."
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1897,159 +1889,154 @@ msgstr ""
"remover todos los paquetes que coincidan <package> (normalmente se genera un "
"error si <package> especifica varios paquetes)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "no ejecutar scriptlet(s) del paquete"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr "reubicar archivos en paquete no reubicable"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-"guardar archivos de paquete borrados renombrándolos en el subdirectorio"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "borrar (desinstalar) paquete"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr "listar todos los archivos de configuración"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "no instalar documentación"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "omitir archivos con el componente inicial <path>"
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<path>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr "reubicar archivos en paquete no reubicable"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "abreviatura para --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "actualizar paquete(s) si ya están instalados"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<packagefile>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "imprimir signo de celdilla durante la instalación del paquete (con -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "no verificar arquitectura del paquete"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "no verificar sistema operativo del paquete"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "no verificar espacio de disco antes de la instalación"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "instalar documentación"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "instalar paquete(s)"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "actualizar la base de datos, mas no modificar el sistema de archivos"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "no verificar las dependencias del paquete"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "no verificar MD5 de los archivos"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr "no reordenar la instalación de paquetes para satisfacer dependencias"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr "no sugerir resolución de dependencias ausentes"
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "no ejecutar %%pre scriptlet (si hay)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "no ejecutar %%post scriptlet (si hay)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "no ejecutar %%preun scriptlet (si hay)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "no ejecutar %%postun scriptlet (si hay)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "no ejecutar ningún scriptlet detonado por este paquete"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "no ejecutar ningún %%triggerprein scriptlet(s)"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "no ejecutar ningún %%triggerin scriptlet(s)"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "no ejecutar ningún %%triggerun scriptlet(s)"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "no ejecutar ningún %%triggerpostun scriptlet(s)"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2057,51 +2044,39 @@ msgstr ""
"cambiar a una versión antigua del paquete (--force en la opción upgrade lo "
"ejecuta de forma automática)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "imprimir porcentaje mientras se instala el paquete"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "realocar el paquete a <dir> si éste es realocable"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "realocar archivos de la ruta <old> a <new>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "guardar archivos de paquetes borrados al re-empaquetar"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "reinstalar si el paquete ya está presente"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr "desinstalar nuevo, reinstalar antiguo, paquete(s), a la fecha <date>"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<date>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
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:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "actualizar paquete(s)"
@@ -2322,53 +2297,49 @@ msgstr "firmar paquete(s) (idéntico a --addsign)"
msgid "generate signature"
msgstr "generar firma"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "se esperaba el paquete fuente, paquete binario encontrado\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "el paquete fuente no contiene archivo .spec\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s: scriptlet %s fallido (%d), omitiendo %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s: scriptlet %s fallido (%d), omitiendo %s\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "ejecución de scriptlet %s de %s-%s-%s falló, estado de salida %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: scriptlet %s fallido (%d), omitiendo %s\n"
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "Incapaz de recargar cabecera de firma\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "falló el desempaquetado de archivos %s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " en archivo"
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "falló %s en archivo %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "falló %s: %s\n"
@@ -2469,7 +2440,7 @@ msgstr "número de paquete inválido: %s\n"
msgid "record %lu could not be read\n"
msgstr "el registro %u no pudo ser leído\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "el paquete %s no está instalado\n"
@@ -2627,8 +2598,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "- no está soportado en cadenas\n"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2639,104 +2610,74 @@ msgstr "la apertura de %s falló: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "etiqueta desconocida"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Error de dependencias:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "Preparando..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Preparando paquetes para la instalación..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "Reempaquetando..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr "Reempaquetando archivos borrados..."
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "Actualizando..."
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "Actualizando paquetes..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Recuperando %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "omitiendo %s - transferencia fallida - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s no puede ser instalado\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "el paquete %s no es reubicable\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "error al leer del archivo %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, 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:577
+#: lib/rpminstall.c:539
#, c-format
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:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "no se puede abrir el archivo %s:%s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" especifica varios paquetes\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "no se puede abrir %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Instalando %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr "Restaurar paquetes (+%d/-%d) a %-24.24s (0x%08x):\n"
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr "Recuperando %s\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3092,56 +3033,6 @@ msgstr "Resumen MD5 incompleto: NO SOPORTADO\n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Firma: DESCONOCIDA (%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr "error al leer cabecera del paquete\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3294,147 +3185,147 @@ msgstr ""
msgid "verify database files"
msgstr "verificar archivos de la base de datos"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: nombre de etiqueta no reconocida: \"%s\" ignorado\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "no se pudo abrir índice %s utilizando db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "no se puede abrir índice %s\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "no se ha establecido dbpath\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "error(%d) obteniendo registros \"%s\" del índice %s\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
#, fuzzy
msgid "miFreeHeader: skipping"
msgstr "rpmdb: omitiendo"
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "error(%d) almacenando registro #%d en %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek fallido: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: falló la apertura: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
#, fuzzy
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdb: omitiendo"
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: cabecera dañada #%u recuperada -- omitiendo.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: no se pudo leer cabecera en 0x%x\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "error(%d) estableciendo registro de cabecera #%d para remoción %s\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "error(%d) estableciendo registros \"%s\" desde índice %s\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "error(%d) almacenando registros \"%s\" en %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "error(%d) removiendo registro \"%s\" de %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "error(%d) asignando nueva instancia de paquete\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
#, fuzzy
msgid "rpmdbAdd: skipping"
msgstr "rpmdb: omitiendo"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "error(%d) almacenando registro %s en %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "no se ha establecido dbpath"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "la base de datos temporal %s ya existe\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "falló la remoción del directorio %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "cabecera #%u errónea en la base de datos -- omitiendo.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "no se puede añadir el registro original en %u\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
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"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
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"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "reemplazar archivos en %s con los archivos de %s a recuperar"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "falló la remoción del directorio %s: %s\n"
@@ -3681,6 +3572,52 @@ msgstr "%s: falló la operación de caché: ec %d.\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: falló la lectura del manifiesto: %s\n"
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr "la restauración recibe un argumento de etiqueta de hora/fecha"
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "argumento de etiqueta hora/fecha mal formado"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr ""
+#~ "guardar archivos de paquete borrados renombrándolos en el subdirectorio"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "guardar archivos de paquetes borrados al re-empaquetar"
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr ""
+#~ "desinstalar nuevo, reinstalar antiguo, paquete(s), a la fecha <date>"
+
+#~ msgid "<date>"
+#~ msgstr "<date>"
+
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Incapaz de recargar cabecera de firma\n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "Reempaquetando..."
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr "Reempaquetando archivos borrados..."
+
+#~ msgid "Upgrading..."
+#~ msgstr "Actualizando..."
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "Actualizando paquetes..."
+
+#~ msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
+#~ msgstr "Restaurar paquetes (+%d/-%d) a %-24.24s (0x%08x):\n"
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "Recuperando %s\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "error al leer cabecera del paquete\n"
+
#~ msgid "========== recording tsort relations\n"
#~ msgstr "========== grabando relaciones tsort\n"
diff --git a/po/fi.po b/po/fi.po
index 7bd0f86b3..dc03cba5a 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2008-03-11 11:15+0200\n"
"Last-Translator: Panu Matilainen <pmatilai@redhat.com>\n"
"Language-Team: Finnish\n"
@@ -79,165 +79,165 @@ msgstr "virhe luettaessa otsikkotietoa paketista\n"
msgid "cannot re-open payload: %s\n"
msgstr "kuorman uudelleenavaus ei onnistu: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Kyselyvalitsimet (-q tai --query yhteydessä)"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Tarkistusvalitsimet (-V tai --verify yhteydessä)"
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr "Lähdevalitsimet (--query tai --verify yhteydessä):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr "Hakemistopuuvalitsimet (--ftswalk yhteydessä):"
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Allekirjoitusvalitsimet:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Tietokantavalitsimet:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Käännösvalitsimet:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Asennus-, päivitys- ja poistovalitsimet:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "Yhteiset valitsimet kaikille rpm moodeille:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versio %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Sisäinen virhe argumenttien käsittelyssä (%d)\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "vain yksi päätila voidaan määritellä"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "vain yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "odottamattomia kyselyvalintoja"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "odottamaton kyselyn muotoilu"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "odottamaton kyselyn lähde"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "vain asennus, päivitys, rmsource ja rmspec voidaan pakottaa"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr "--prefix valintaa ei voi käyttää --relocate tai --excludepath kanssa"
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate ja --excludepath: voidaan käyttää vain uusia paketteja "
"asennettaessa"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix parametrien pitää alkaa /-merkillä"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -245,7 +245,7 @@ msgstr ""
"skriptien estovalintoja voidaan käyttää vain paketteja asennettaessa tai "
"poistettaessa"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -253,7 +253,7 @@ msgstr ""
"laukaisimien estovalintoja voidaan käyttää vain paketteja asennettaessa tai "
"poistettaessa"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -261,7 +261,7 @@ msgstr ""
"--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
"tarkistettaessa"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -269,7 +269,7 @@ msgstr ""
"--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
"käännettäessä"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -277,82 +277,82 @@ msgstr ""
"--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
"kyseltäessä ja tietokannan uudelleenluonnissa"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametrit --root (-r):lle alettava /-merkillä"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "ei tiedostoja allekirjoitettavaksi\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "en voinut avata tiedostoa %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp:tä ei löytynyt"
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Syötä salasana: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Salasanan tarkistus epäonnistui\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Salasana täsmää.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "suoritus epäonnistui\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "uudelleenkäännolle ei määritelty paketteja"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "käännökselle ei annettu määrittelytiedostoja"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "käännökselle ei määritelty tar-tiedostoja"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "poistolle ei määritelty paketteja"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "asennukselle ei määritelty paketteja"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "kyselylle ei annettu parametrejä"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "tarkistukselle ei annettu parametrejä"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "ei annettu parametrejä"
@@ -568,7 +568,7 @@ msgstr "Tiedosto tarvitsee aloitusmerkin \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Täydennys ei sallittu: %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Tiedostoa ei löytynyt täydennyksellä: %s\n"
@@ -737,7 +737,7 @@ msgstr "Allekirjoitusotsikon uudelleenlataus ei onnistu\n"
msgid "Could not open %s: %s\n"
msgstr "%s:aa ei voitu avata: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Pakettia ei voitu kirjoittaa: %s\n"
@@ -1262,17 +1262,17 @@ msgstr "älä tarkista käännösriippuvuuksia"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "älä tarkista pakettien tarkistussummia"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "älä tarkista otsikkotietoja haettaessa tietokanssata"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "älä tarkista paketin allekirjoitusta"
@@ -1314,7 +1314,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Ei voitu suorittaa %s:ää: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Ei voitu suorittaa %s:ää: %s\n"
@@ -1804,40 +1804,32 @@ msgstr ""
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "siirtojen pitää alkaa /-merkillä"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "siirroissa pitää olla =-merkki"
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "siirroissa pitää olla / =-merkin jälkeen"
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr "lisää ehdotetut paketit transaktioon"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"asenna kaikki tiedostot, myös konfiguraatiot, jotka muuten ehkä ohitettaisiin"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1845,155 +1837,151 @@ msgstr ""
"poista kaikki paketit, joiden nimeä vastaa <paketti> (tavallisesti, jos "
"<paketti> määrittää useita paketteja, tulee virhe)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "älä suorita pakettikohtaisia skriptejä"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr ""
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "poista paketti"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "älä asenna konfigurointiedostoja"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "älä asenna dokumentointia"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "ohita <polku>-alkuiset tiedostot"
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<polku>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr "havaitse tiedostokonfliktit pakettien välillä"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "lyhenne parametreille --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "päivitä vain jo asennetut paketit"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<pakettitiedosto>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "tulosta risuaitaa paketin asentuessa (-v:n kanssa hyvä)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "älä tarkista paketin arkkitehtuuria"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "älä tarkista paketin käyttöjärjestelmää"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "älä tarkista levytilaa ennen asennusta"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "asenna dokumentaatio"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "asenna paketteja"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "älä tarkista paketin riippuvuuksia"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "älä tarkista tiedostojen MD5-summaa"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "älä suorita %%pre-scriptiä"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "älä suorita %%post-scriptiä"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "älä suorita %%preun-scriptiä"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "älä suorita %%postun scriptiä"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "älä suorita tämän paketin laukaisemia skriptejä"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "älä suorita %%triggerprein skriptejä"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "älä suorita %%triggerin skriptejä"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "älä suorita %%triggerun scriptejä"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "älä suorita %%triggerpostun scriptejä"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2001,51 +1989,39 @@ msgstr ""
"päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
"automaattisesti)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "tulosta asennuksen eteneminen prosentteina"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<hakemisto>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<vanha>=<uusi>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr ""
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr "älä huomioi tiedostokonflikteja pakettien välillä"
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "asenna uudelleen, jos paketti on jo asennettu"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<päivämäärä>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr "älä asenna, mutta kerro onnistuisiko se"
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "päivitä paketteja"
@@ -2260,53 +2236,49 @@ msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
msgid "generate signature"
msgstr "luo allekirjoitus"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:864
+#: lib/psm.c:854
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s(%s-%s-%s.%s) scripti epäonnistui, waitpid(%d) palautti %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s(%s-%s-%s.%s) skripti epäonnistui, signaali %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "%s(%s-%s-%s.%s) skripti epäonnistui, palautti %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: %s skripti epäonnistui (%d), ohitetaan %s\n"
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "Allekirjoitusotsikon uudelleenlataus ei onnistu\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "arkiston %s%s purkaminen epäonnistui: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " tiedostolle "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s epäonnistui tiedostolle %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s epäonnistui: %s\n"
@@ -2407,7 +2379,7 @@ msgstr "virheellinen paketin numero: %s\n"
msgid "record %lu could not be read\n"
msgstr "tietuetta %lu ei voitu lukea\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
@@ -2553,8 +2525,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr ""
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2565,104 +2537,74 @@ msgstr "%s:n avaus ei onnistunut: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "tuntematon nimiö: \"%s\"\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Puuttuvia riippuvuuksia:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "Valmistellaan..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Valmistellaan paketteja asennukseen..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "Uudelleenpaketoidaan..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr "Uudelleenpaketoiden poistettuja tiedostoja..."
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "Päivitetään..."
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "Päivitetään paketteja..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Haetaan %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "ohitetaan %s - siirto epäonnistui - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s:ää ei voida asentaa\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, c-format
msgid "package %s is not relocatable\n"
msgstr "paketti %s ei ole uudelleensijoitettava\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "virhe luettaessa tiedostosta %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "tiedosto %s vaatii uudemmat version RPM:stä\n"
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: ei ole rpm paketti (tai pakettilista): %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "en voinut avata tiedostoa %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" määrittää useita paketteja\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "virhe: en voi avata %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Asennetaan %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr "Siivotaan uudelleenpaketoituja paketteja:\n"
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr "\tPoistetaan %s\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3011,55 +2953,6 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr ""
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, c-format
msgid "missing %c %s"
@@ -3207,142 +3100,142 @@ msgstr "rakenna tietokanta uudestaan asennettujen pakettien tiedoista"
msgid "verify database files"
msgstr "tarkista tietokanta"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "indeksin %s avaus db%d:llä ei onnistu - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "indeksin %s avaus ei onnistu\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "dbpath ei ole asetettu\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "virhe(%d) haettaessa \"%s\" tietueita indeksistä %s\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: ohitetaan"
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "virhe(%d) tallennettaessa tietuetta #%d %s:ään\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec epäonnistui: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp epäonnistui: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: ohitetaan"
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: ohitetaan vioittunut otsikkotietue #%u.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: otsikkoa ei voida lukea (0x%x)\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "virhe(%d) asetettaessa otsikon #%d tietuetta %s poistettavaksi\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "virhe(%d) asetettaessa \"%s\" tietuetita indeksistä %s\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "virhe(%d) tallennettaessa tietuetta %s %s:ään\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "virhe(%d) poistettaessa tietuetta %s %s:stä\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "virhe(%d) varattaessa uutta paketti-instanssia\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr "rpmdbAdd: ohitetaan"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "virhe(%d) tallennettaessa tietuetta %s %s:ään\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "dbpath ei ole asetettu"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "väliaikainen tietokanta %s on jo olemassa\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "hakemiston %s luonti epäonnistui: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "tietue numero %u tietokannassa viallinen -- ohitetaan.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "alkupäisen tietueen %u lisäys ei onnistu\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"tietokannan uudelleenrakennus epäonnistui: alkuperäinen kanta paikallaan\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "vanhan tietokannan korvaus uudella epäonnistui!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "korvaa tiedostot %s:ssä tiedostoilla %s:stä korjataksesi"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "hakemiston %s poisto epäonnistui: %s\n"
@@ -3583,3 +3476,27 @@ msgstr "%s: välimuistioperaatio epäonnistui: %d\n"
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: pakettilistan luku epäonnistui: %s\n"
+
+#~ msgid "<date>"
+#~ msgstr "<päivämäärä>"
+
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Allekirjoitusotsikon uudelleenlataus ei onnistu\n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "Uudelleenpaketoidaan..."
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr "Uudelleenpaketoiden poistettuja tiedostoja..."
+
+#~ msgid "Upgrading..."
+#~ msgstr "Päivitetään..."
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "Päivitetään paketteja..."
+
+#~ msgid "Cleaning up repackaged packages:\n"
+#~ msgstr "Siivotaan uudelleenpaketoituja paketteja:\n"
+
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "\tPoistetaan %s\n"
diff --git a/po/fr.po b/po/fr.po
index 41a24cf20..16388b459 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\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"
@@ -88,61 +88,61 @@ msgstr "erreur dans la lecteur de l'entête du paquetage\n"
msgid "cannot re-open payload: %s\n"
msgstr "Impossible de ré-ouvrir la charge utile: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Options de requêtes (avec -q ou --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Options de vérifications (avec -V ou --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
#, fuzzy
msgid "Source options (with --query or --verify):"
msgstr "Options de vérifications (avec -V ou --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Otions de signatures"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Options de la base de données"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"Options de construction avec [ <fichier_spec> | <tarball> | <paquetage "
"source> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Options d'installation/désinstallation/mise à jour:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "Options communes a tous les modes et executables rpm:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -150,112 +150,112 @@ msgstr ""
"Ce programme peut être librement redistribué sous les termes de la licence "
"GNU GPL\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Erreur interne au traitement de l'argument (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "un seul mode majeur peut être specifié"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "un seul type de requête/vérification à la fois"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "option de requête inattendue"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "format de requête inattendu"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "source de requête inattendue"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"seuls l'installation, la mise à jour, rmsource et rmspec peuvent être forcés"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "les fichiers ne peuvent être relogés qu'à l'installation"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr "impossible d'utiliser --prefix avec --relocate ou --excludepath"
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate et --excludepath ne peuvent être utilisés qu'à l'installation de "
"nouveaux paquetages"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr ""
"--prefix ne peut être utilisé qu'à l'installation de nouveaux paquetages"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "les arguments de --prefix doivent commencer par un /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ne peut être utilisé qu'à l'installation de paquetages"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent ne peut être utilisé qu'à l'installation de paquetages"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ne peut être utilisé qu'à l'installation de paquetages"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ne peut être utilisé qu'à l'installation de paquetages"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ne peut être utilisé qu'à l'installation de paquetages"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "utiliser --excludedocs _OU_ --includedocs (pas les 2)"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ne peut être utilisé qu'à l'installation de paquetages"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos ne peut être utilisé qu'à l'installation de paquetages"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize ne peut être utilisé qu'à l'installation de paquetages"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--allmatches ne peut être utilisé qu'à la désinstallation de paquetages"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ne peut être utilisé qu'à l'installation de paquetages"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb ne peut être utilisé qu'à l'installation/la désinstallation de "
"paquetages"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -263,7 +263,7 @@ msgstr ""
"les options désactivant les scripts ne peuvent être utilisées qu'à la (dés)"
"installation"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -271,7 +271,7 @@ msgstr ""
"les options desactivant les triggers ne peuvent être utilisées qu'à la (dés)"
"installation"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -279,14 +279,14 @@ msgstr ""
"--nodeps ne peut être spécifié que pour la (re)construction, la "
"recompilation, l'(dés)installation, et la vérification"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test ne peut être spécifié que pour la (dés)installation et la construction"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -294,82 +294,82 @@ msgstr ""
"--root (-r) ne peut être utilisé que pour la (dés)installation, les requêtes "
"et la reconstruction de la base de données"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "les arguments ed --root (-r) doivent commencer par un /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "aucun fichier à signer\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "ne peut accéder au fichier %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp non trouvé: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Entrez la phrase de passe: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Mauvaise phrase de passe\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Phrase de passe bonne.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "%%_signature invalide and le fichier de macros.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign est réservé à la construction d'un paquetage"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "echec de l'exec\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "aucun paquetage spécifié pour reconstruction"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "aucun fichier spec spécifié pour construction"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "aucun fichier tar spécifié pour construction"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "n'a aucun paquetage à désinstaller"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "n'a aucun paquetage à installer"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "aucun argument fourni à la requête"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "aucun argument fourni à la vérification"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "aucun argument fourni"
@@ -586,7 +586,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:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Fichier non trouvé par la substitution: %s\n"
@@ -755,7 +755,7 @@ msgstr "Impossible de recharger l'entête de la signature.\n"
msgid "Could not open %s: %s\n"
msgstr "Impossible d'ouvrir %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Impossible d'écrire le paquetage: %s\n"
@@ -1295,17 +1295,17 @@ msgstr "ne pas vérifier les dépendances de construction"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr "générer un(des) entête(s) compatible(s) avec l'emballage rpm[23]"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "ne pas vérifier les sommes de hachage du paquetage"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "ne pas vérifier l'entête de la base de données à la récupération"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "ne pas vérifier la(les) signature(s) du paquetage"
@@ -1348,7 +1348,7 @@ msgstr "générer un entête compatible avec l'emballage rpm[23]"
msgid "Couldn't exec %s: %s\n"
msgstr "Impossible d'exécuter %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, fuzzy, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Impossible d'ouvrir %s: %s\n"
@@ -1851,40 +1851,32 @@ msgstr "déboguer la manipulation de cache d'URL"
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: table d'option mal configurée (%d)\n"
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "les chemins d'exclusions doivent commencer par un /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "les relogements doivent commencer par un /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "les relogement doivent contenir un ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "dans les relogements un / doit suivre le ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr "le roulement arrière prend comme argument une date"
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr "argument date du roulement arrière malformé"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr "rajouter à la transaction les paquetages suggérés"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"installer tous les fichiers, meme si les configurations disent le contraire"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1892,165 +1884,159 @@ msgstr ""
"retirer tous les paquetages qui correspondent à <paquetage> (normalement on "
"retourne une erreur si le <paquetage> correspond à plusieurs paquetages"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "ne pas exécuter le(s) scriptlet(s) du paquetages"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr "reloger des fichiers d'un paquetage non relogeable"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-"sauver les fichiers du paquetage désinstallé en les renommant dans un sous-"
-"répertoire"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "désinstaller un paquetage"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<paquetage>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "ne pas installer les fichiers de configuration"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "ne pas installer la documentation"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "sauter les fichiers commence par le <chemin> indiqué"
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<chemin>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr "reloger des fichiers d'un paquetage non relogeable"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "raccourci pour --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "met à jour le(s) paquetage(s) déjà installé(s)"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<paquetage>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr ""
"afficher des marqueurs au fur et à mesure que le paquetage s'installe (avec -"
"v c'est bien(tm))"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "ne pas vérifier l'architecture du paquetage"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "ne pas vérifier le système d'exploitation du paquetage"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "ne pas vérifier l'espace disque avant l'installation"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "installer la documentation"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "installer le(s) paquetage(s)"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr ""
"mettre à jour la base données, mais ne pas modifier le système de fichiers"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "ne pas vérifier les dépendances du paquetage"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "ne pas vérifier les sommes MD5 des fichiers"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
#, fuzzy
msgid "don't install file security contexts"
msgstr "ne pas installer les fichiers de configuration"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"ne pas ré-arranger l'ordre d'installation des paquetages pour satisfaire les "
"dépendances"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr "ne pas suggérer de résolution pour les dépendances manquantes"
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "ne pas exécuter le scriptlet %%pre (s'il existe)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "ne pas exécuter le scriptlet %%post (s'il existe)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "ne pas exécuter le scriptlet %%preun (s'il existe)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "ne pas exécuter le scriptlet %%postun (s'il existe)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "n'exécuter aucun scriptlet trigger activé par ce paquetage"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "n'exécuter aucun scriplet %%triggerprein"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "n'exécuter aucun scriplet %%triggerin"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "n'exécuter aucun scriptlet %%triggerun"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "n'exécuter aucun scriptlet %%triggerpostun"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2058,54 +2044,39 @@ msgstr ""
"mettre à jour avec un paquetage plus ancien (une m-à-j avec --force fait ça "
"automatiquement"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "afficher le pourcentage d'installation du paquetage"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "reloge le paquetage vers <rep>, si relogeable"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<rep>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "reloge les fichiers du <vieux> chemin vers <nouveau>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<vieux>=<nouveau>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr ""
-"sauvegarder les fichiers du paquetage désinstallé en les ré-empaquetant"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "réinstalle si le paquetage est déjà installé"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-"désinstaller le(s) nouveau(x), ré-installer le(s) vieux paquetages, comme "
-"c'était le cas pour cette <date>"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<date>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
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:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "mises à jour des paquetages"
@@ -2335,53 +2306,49 @@ msgstr "signer le(s) paquetage(s) (identique à --addsign)"
msgid "generate signature"
msgstr "génération de signature"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "paquetage source attendu, paquetage binaire trouvé\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "le paquetage source ne contient pas de fichier .spec\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s(%s-%s-%s) échec du scriptlet, waitpid(%d) rc %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s(%s-%s-%s) échec du scriplet, code de sortie %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "%s(%s-%s-%s) échec du scriplet, code de sortie %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: échec du scriptlet %s (%d), on saute %s\n"
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "Impossible de recharger l'entête de signature\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "échec du déballage de l'archive %s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " dans fichier "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "échec de %s sur le fichier %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "échec %s: %s\n"
@@ -2483,7 +2450,7 @@ msgstr "numéro de paquetage invalide: %s\n"
msgid "record %lu could not be read\n"
msgstr "impossible de lire l'article %u\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "le paquetage %s n'est pas installé\n"
@@ -2643,8 +2610,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "- non supporté sur des chaînes de caractères\n"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2655,105 +2622,74 @@ msgstr "échec de l'ouverture de %s: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "tag inconnu: \"%s\"\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Dépendances requises:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "Préparation... "
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Préparation des paquetages pour l'installation..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "Ré-emballage..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr "Ré-emballage des fichiers effacés..."
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "Mise à jour..."
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "Mise à jour des paquetages..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Récupération de %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ignoré - échec du téléchargement - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ne peut être installé\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "le paquetage %s n'est pas relogeable\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "erreur en lisant %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, 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:577
+#: lib/rpminstall.c:539
#, c-format
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:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ne peut ouvrir le fichier %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" spécifie plusieurs paquetages\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Installation de %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-"Roulement arrière des paquetages (+%d/-%d) jusqu'à %-24.24s (0x%08x):\n"
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr "Récupération de %s\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3114,56 +3050,6 @@ msgstr "Somme MD5 erronée: NONSUPPORTE\n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signature: INCONNUE (%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr "erreur dans la lecteur de l'entête du paquetage\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3314,146 +3200,146 @@ msgstr ""
msgid "verify database files"
msgstr "vérifier les fichiers de la base de données"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: nom de tag non-reconnu: \"%s\" ignoré\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "ne peut ouvrir l'index %s en utilisant db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "ne peut ouvrir l'index %s\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "aucun dbpath n'a été fourni\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "erreur(%d) en attrapant les articles \"%s\" de l'index %s\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: on saute"
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "erreur(%d) en stockant l'article nº%d dans %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: échec de fseek: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: échec de l'ouverture: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: on saute"
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: l'entête nº%u endommagé a été téléchargé -- ignoré.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: impossible de lire l'entête à 0x%x\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
"erreur(%d) en affectant l'article de l'entête nº%d pour l'enlèvement de %s\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "erreur(%d) en affectant les articles \"%s\" de l'index %s\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "erreur(%d) en stockant l'article \"%s\" dans %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "erreur(%d) en enlevant l'article \"%s\" de %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "erreur(%d) en allouant une nouvelle instance de paquetage\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr "rpmdbAdd: on saute"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "erreur(%d) en stockant l'article %s dans %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "aucun dbpath fourni"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "la base de données temporarire %s existe déjà\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "Ne peut détruire le répertoire %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "l'entête nº%u dans la base de données n'est pas bon -- ignoré.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "impossible d'ajouter l'article qui était au départ à %u\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"Ne peut reconstruire la base de données: la base originale reste telle "
"qu'elle est\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "Ne peut remplacer la vieille base de données par la nouvelle!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
"remplacer les fichiers dans %s avec les fichiers de %s pour faire une "
"récupération"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "Ne peut détruire le répertoire %s: %s\n"
@@ -3699,6 +3585,56 @@ msgstr "%s: échec de l'opération sur le cache: ec %d.\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: échec de la lecture de la liste de paquetages: %s\n"
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr "le roulement arrière prend comme argument une date"
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "argument date du roulement arrière malformé"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr ""
+#~ "sauver les fichiers du paquetage désinstallé en les renommant dans un "
+#~ "sous-répertoire"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr ""
+#~ "sauvegarder les fichiers du paquetage désinstallé en les ré-empaquetant"
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr ""
+#~ "désinstaller le(s) nouveau(x), ré-installer le(s) vieux paquetages, comme "
+#~ "c'était le cas pour cette <date>"
+
+#~ msgid "<date>"
+#~ msgstr "<date>"
+
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Impossible de recharger l'entête de signature\n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "Ré-emballage..."
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr "Ré-emballage des fichiers effacés..."
+
+#~ msgid "Upgrading..."
+#~ msgstr "Mise à jour..."
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "Mise à jour des paquetages..."
+
+#~ msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
+#~ msgstr ""
+#~ "Roulement arrière des paquetages (+%d/-%d) jusqu'à %-24.24s (0x%08x):\n"
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "Récupération de %s\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "erreur dans la lecteur de l'entête du paquetage\n"
+
#~ msgid "========== recording tsort relations\n"
#~ msgstr "========== enregistrement des relations de Ttri\n"
diff --git a/po/is.po b/po/is.po
index 30a654f75..149e9e173 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\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"
@@ -80,267 +80,267 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr ""
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr ""
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr ""
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM tgfa %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, fuzzy, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr "Hfundarrttur (C) 1998-2000 - Red Hat Inc"
-#: rpmqv.c:147
+#: rpmqv.c:145
#, fuzzy, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "essu m dreifa frjlst samkvmt skilmlum GNU GPL"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr ""
@@ -554,7 +554,7 @@ msgstr ""
msgid "Glob not permitted: %s\n"
msgstr "Gat ekki opna PreUn skr: %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Skrin fannst ekki me 'glob': %s\n"
@@ -724,7 +724,7 @@ msgstr "Get ekki lesi haus r %s: %s\n"
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Get ekki rita pakka: %s\n"
@@ -1248,19 +1248,19 @@ msgstr "ekki skoa pakkaskilyrin"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "ekki skoa pakkaskilyrin"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
#, fuzzy
msgid "don't verify database header(s) when retrieved"
msgstr "ekki skoa pakkaskilyrin"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
#, fuzzy
msgid "don't verify package signature(s)"
@@ -1303,7 +1303,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Gat ekki keyrt %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Gat ekki bi til undirferli (fork) %s: %s\n"
@@ -1796,247 +1796,223 @@ msgstr ""
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
#, fuzzy
msgid "add suggested packages to transaction"
msgstr "fyrirspurn/yfirfer pakkann sam skr"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr ""
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<pakkaskr>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr "birta einungis stillingaskrr (innifelur -l)"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<pakkaskr>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:208
+#: lib/poptI.c:189
#, fuzzy
msgid "install package(s)"
msgstr "setja inn pakka"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "ekki yfirfara MD5 undirritun skra"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
#, fuzzy
msgid "don't install file security contexts"
msgstr "birta einungis stillingaskrr (innifelur -l)"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<gmul>=<n>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr ""
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr ""
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "uppfra pakka"
@@ -2264,54 +2240,49 @@ msgstr ""
msgid "generate signature"
msgstr "ba til undirskrift"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "pakkinn inniheldur enga .spec skr\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/psm.c:873
+#: lib/psm.c:863
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr ""
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1581
-#, fuzzy
-msgid "Unable to reload signature header\n"
-msgstr "Get ekki lesi haus r %s: %s\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr ""
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "gat ekki opna %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s brst\n"
@@ -2412,7 +2383,7 @@ msgstr ""
msgid "record %lu could not be read\n"
msgstr ""
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2559,8 +2530,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr ""
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2571,106 +2542,75 @@ msgstr ""
msgid "unknown tag: \"%s\"\n"
msgstr "ekkt tegund tknmyndar: %s\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "gat ekki tbi pakkaskilyri:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr ""
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr ""
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr ""
-
-#: lib/rpminstall.c:201
-#, fuzzy
-msgid "Upgrading packages..."
-msgstr "uppfra pakka"
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "Skrin %s er ekki venjuleg skr.\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, fuzzy, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "get ekki opna pakka gagnagrunn \n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr ""
-
#: lib/rpmlead.c:100
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
@@ -3021,55 +2961,6 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr ""
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3218,141 +3109,141 @@ msgstr ""
msgid "verify database files"
msgstr ""
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "get ekki opna %s index me db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "get ekki opna %s index\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek brst: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: Fseek brst: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "gat ekki bi til %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3597,6 +3488,14 @@ msgid "%s: read manifest failed: %s\n"
msgstr "%s rmdir %s brst: %s\n"
#, fuzzy
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Get ekki lesi haus r %s: %s\n"
+
+#, fuzzy
+#~ msgid "Upgrading packages..."
+#~ msgstr "uppfra pakka"
+
+#, fuzzy
#~ msgid "%5d 0x%04x %s %s\n"
#~ msgstr "Skr %s: %s\n"
diff --git a/po/it.po b/po/it.po
index 93117b5a9..ec4218879 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2006-04-28 06:25+0200\n"
"Last-Translator: \n"
"Language-Team: <it@li.org>\n"
@@ -84,61 +84,61 @@ msgstr "errore durante la lettura dell'intestazione dal pacchetto\n"
msgid "cannot re-open payload: %s\n"
msgstr "impossibile riaprire payload: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Opzioni d'interrogazione (con -q o --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Opzioni di verifica (con -V o --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
#, fuzzy
msgid "Source options (with --query or --verify):"
msgstr "Opzioni di verifica (con -V o --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Opzioni della firma:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Opzioni del database:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"Opzioni di compilazione 'Build' con [ <specfile> | <tarball> | <source "
"package> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Opzioni Installa/Aggiorna/Rimuovi:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "Opzioni comuni per tutte le modalità rpm ed eseguibili:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "Versione RPM %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -146,128 +146,128 @@ msgstr ""
"Questo programma può essere ridistribuito liberamente sotto i termini della "
"GNU GPL\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Errore interno durante la processazione dell'argomento (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "è possibile specificare solo una modalità principale"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "è possibile eseguire solo un tipo di interrogazione/verifica per volta"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "flag d'interrogazione inaspettate"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "formato d'interrogazione inaspettato"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "origine d'interrogazione inaspettata"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"è possibile forzare solo i processi d'installazione, aggiornamento rmsource "
"e rmspec"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr ""
"i file possono essere riposizionati solo durante l'installazione del "
"pacchetto"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate e --excludepath possono essere usati solo quando si installano "
"nuovi pacchetti"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix può essere usato solo quando si installano nuovi pacchetti"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "gli argomenti per --prefix devono iniziare con /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
"--hash (-h) può essere specificato solo durante l'installazione del pacchetto"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr ""
"--percent può essere specificato solo durante l'installazione del pacchetto"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs può essere specificato solo durante l'installazione del "
"pacchetto"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr ""
"--excludedocs può essere specificato solo durante l'installazione del "
"pacchetto"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr ""
"--includedocs può essere specificato solo durante l'installazione del "
"pacchetto"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "è possibile specificare solo uno tra --excludedocs e --includedocs"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr ""
"--ignorearch può essere specificato solo durante l'installazione del "
"pacchetto"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr ""
"--ignoreos può essere specificato solo durante l'installazione del pacchetto"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr ""
"--ignoresize può essere specificato solo durante l'installazione del "
"pacchetto"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--allmatches può essere specificato solo durante la rimozione del pacchetto"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr ""
"--allfiles può essere specificato solo durante l'installazione del pacchetto"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb può essere specificato solo durante l'installazione e la rimozione "
"del pacchetto"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -275,7 +275,7 @@ msgstr ""
"le opzioni per la disabilitazione dello script possono essere specificate "
"solo durante l'installazione e la rimozione del pacchetto"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -283,7 +283,7 @@ msgstr ""
"le opzioni di disabilitazione dell' attivazione possono essere specificate "
"solo durante l'installazione e la rimozione del pacchetto"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -291,7 +291,7 @@ msgstr ""
"--nodeps può essere specificato solo durante la creazione, ricreazione, "
"ricompilazione, installazione, eliminazione e verifica del pacchetto"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -299,7 +299,7 @@ msgstr ""
"--test può essere specificato solo durante l'installazione, rimozione e "
"creazione del pacchetto"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -307,82 +307,82 @@ msgstr ""
"--root (-r) può essere specificato solo durante l'installazione, la "
"rimozione, l'interrogazione e nei processi di ricreazione del database"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "gli argomenti per --root (-r) devono iniziare con /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "nessun file da firmare\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "impossibile accedere il file %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp non trovato: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Inserire la frase chiave:"
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Controllo frase chiave fallito\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "La frase chiave risulta valida.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Spec %%_signature invalida nel file macro.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "è possibile usare --sign solo durante la compilazione del pacchetto"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "exec fallito\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "non è stato specificato alcun file del pacchetto per la ricompilazione"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "non è stato specificato alcun file spec per la compilazione"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "non è stato specificato alcun file tar per la compilazione"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "non è stato specificato alcun pacchetto per la rimozione"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "non è stato specificato alcun pacchetto per l'installazione"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "non è stato specificato alcun argomento per l'interrogazione"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "non è stato specificato alcun argomento per la verifica"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "non è stato specificato alcun argomento"
@@ -599,7 +599,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:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "File non trovato da glob: %s\n"
@@ -768,7 +768,7 @@ msgstr "Impossibile ricaricare intestazione firma.\n"
msgid "Could not open %s: %s\n"
msgstr "Impossibile aprire %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Impossibile scrivere il pacchetto: %s\n"
@@ -1302,17 +1302,17 @@ msgstr ""
"genera l'intestazione del pacchetto compatibile con il packaging (legacy) rpm"
"[23]"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "non verificare il digest del pacchetto/i"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "non verificare l'intestazione del database una volta ripristinata"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "non verificare la firma(e) del pacchetto"
@@ -1354,7 +1354,7 @@ msgstr "ganara le intestazioni compatibili con il (legacy) rpm[23] packaging"
msgid "Couldn't exec %s: %s\n"
msgstr "Impossibile eseguire %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Impossibile biforcare %s: %s\n"
@@ -1858,42 +1858,34 @@ msgstr "gestione cache URL di debug"
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: tabella opzioni configurata in modo errato (%d)\n"
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "i percorsi exclude devono iniziare con una /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "riposizionamenti devono iniziare con una /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "riposizionamenti devono contenere un ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "riposizionamenti devono avere una / seguita da ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr "il rollback accetta un argomento data/ora"
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr "argomento data/ora di rollback malformato"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
#, fuzzy
msgid "add suggested packages to transaction"
msgstr "interrogare/verificare i pacchetti dall'operazione di installazione"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"installa tutti i file, anche le configurazioni che possono altrimenti essere "
"saltate"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1901,162 +1893,157 @@ msgstr ""
"rimuovi tutti i pacchetti corrispondenti <package> (normalmente viene "
"generato un errore se <package> vengono specificati pacchetti multipli)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "non eseguire lo scriptlet del pacchetto"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr "trasferisci i file in un pacchetto non trasferibile"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-"salva i file del pacchetto rimosso rinominandoli in una sotto-directory"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "rimuovi (disinstalla) il pacchetto"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr "elenca tutti i file di configurazione"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "non installare la documentazione"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "salta i file che presentano un componente che li precede <path> "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<path>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr "trasferisci i file in un pacchetto non trasferibile"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "abbreviazione di --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "aggiorna i pacchetti se già installati"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<packagefile>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr ""
"mostra i segni cancelletto durante l'installazione del pacchetto (buono con -"
"v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "non verificare l'architettura del pacchetto"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "non verificare il sistema operativo del pacchetto"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "non controllare lo spazio del disco prima dell'installazione"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "installa documentazione"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "installa i pacchetti"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "aggiorna il database, senza modificare il filesystem"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "non verificare le dipendenze del pacchetto"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "non verificare l'MD5 digest dei file"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"non riordinare l'installazione del pacchetto per soddisfare le dipendenze"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr "non suggerire alcuna risoluzione delle dipendenze mancanti"
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "non eseguire alcun scriptlet %%pre (se esistenti)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "non eseguire alcun scriptlet %%post (se esistenti)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "non eseguire alcun scriptlet %%preun (se esistenti)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "non eseguire alcun scriptlet %%postun (se esistenti)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "non eseguire alcun scriptlet causato da questo pacchetto"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "non eseguire alcun scriptlet %%triggerprein"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "non eseguire alcun scriptlet %%triggerin"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "non eseguire alcun scriptlet %%triggerun"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "non eseguire alcun scriptlet %%triggerpostun"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2064,51 +2051,39 @@ msgstr ""
"aggiorna ad una versione più vecchia del pacchetto (sugli aggiornamenti --"
"force esegue questa operazione automaticamente)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "mostra le percentuali durante le installazioni del pacchetto"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "riposiziona il pacchetto su <dir>, se trasferibile"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "riposiziona i file dal path <old> su <new>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "salva i file del pacchetto rimosso rieseguendo il packaging"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "installa nuovamente se il pacchetto è già presente"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr "disinstallare nuovo, reinstallare vecchio, pacchetti, dal <date>"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<date>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr "non installare, ma indicare se funziona oppure no"
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "aggiorna i pacchetti"
@@ -2330,53 +2305,49 @@ msgstr "firma pacchetto (identico a --addsign)"
msgid "generate signature"
msgstr "genera firma"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "pacchetto sorgente atteso, trovato binario\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "pacchetto sorgente non contiene alcun file .spec\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s: scriptlet %s fallito (%d), omissione %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s: scriptlet %s fallito (%d), omissione %s\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "esecuzione scriptlet %s da %s-%s-%s fallita, exit status %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: scriptlet %s fallito (%d), omissione %s\n"
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "Impossibile ricaricare l'intestazione della firma\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "estrazione archivio fallita%s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " sul file "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s fallito sul file %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s fallito: %s\n"
@@ -2478,7 +2449,7 @@ msgstr "numero invalido del pacchetto: %s\n"
msgid "record %lu could not be read\n"
msgstr "impossibile leggere il record %u\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "il pacchetto %s non è stato installato\n"
@@ -2639,8 +2610,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "- non supportato per le stringhe\n"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2651,104 +2622,74 @@ msgstr "apertura di %s fallita: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "etichetta sconosciuta"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Dipendenze fallite:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "Preparazione in corso..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Preparazione pacchetti per l'installazione..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "Repackaging..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr "Repackaging dei file rimossi..."
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "Aggiornamento in corso..."
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "Aggiornamento pacchetti in corso..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Ripristino di %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "omissione %s - trasferimento fallito - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s non può essere installato\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "il pacchetto %s non è riposizionabile\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "errore di lettura dal file %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, 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:577
+#: lib/rpminstall.c:539
#, c-format
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:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "impossibile aprire il file %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" specifica pacchetti multipli\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "impossibile aprire %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "installazione di %s in corso\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr "Rollback dei pacchetti (+%d/-%d) fino a %-24.24s (0x%08x):\n"
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr "Ripristino di %s\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3106,56 +3047,6 @@ msgstr "MD5 digest discontinuo: NON SUPPORTATO\n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Firma: SCONOSCIUTA (%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr "errore durante la lettura dell'intestazione dal pacchetto\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3306,148 +3197,148 @@ msgstr ""
msgid "verify database files"
msgstr "verifica file del database"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: nome etichetta non riconosciuto: \"%s\" ignorato\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "impossibile aprire l'indice %s utilizando db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "impossibile aprire l'indice %s\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "non è stato impostato alcun dbpath\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "errore(%d) durante l'acquisizione dei record \"%s\" dall'indice %s\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
#, fuzzy
msgid "miFreeHeader: skipping"
msgstr "rpmdb: omissione in corso"
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "errore(%d) nella memorizzazione del record #%d nel %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek fallito: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: apertura fallita: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
#, fuzzy
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdb: omissione in corso"
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: ripresa intestazione #%u danneggiata -- omissione in corso.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: impossibile leggere intestazione su 0x%x\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
"errore(%d) nell'impostazione del record #%d dell'intestazione per la "
"rimozione di %s\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "errore(%d) nell'impostazione dei record \"%s\" dall'indice %s\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "errore(%d) nella memorizzazione del record \"%s\" nel %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "errore(%d) nella rimozione del record \"%s\" da %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "errore(%d) nell'allocazione di una nuova istanza del pacchetto\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
#, fuzzy
msgid "rpmdbAdd: skipping"
msgstr "rpmdb: omissione in corso"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "errore(%d) nella memorizzazione del record %s nel %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "non è stato impostato alcun dbpath"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "%s del database provvisorio è già esistente\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "rimozione %s della directory fallita: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
"#%u dell'intestazione nel database è incorretto -- omissione in corso.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "impossibile aggiungere il record ariginariamente su %u\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ricompilazione database fallita: sarà implementato il database originale\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "sostituzione del vecchio database con il nuovo database fallita!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "per eseguire un ripristino sostituire i file in %s con i file di %s"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "rimozione %s della directory fallita: %s\n"
@@ -3693,6 +3584,51 @@ msgstr "%s: operazione cache fallita: ec %d.\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: lettura manifesto fallita: %s\n"
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr "il rollback accetta un argomento data/ora"
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "argomento data/ora di rollback malformato"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr ""
+#~ "salva i file del pacchetto rimosso rinominandoli in una sotto-directory"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "salva i file del pacchetto rimosso rieseguendo il packaging"
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr "disinstallare nuovo, reinstallare vecchio, pacchetti, dal <date>"
+
+#~ msgid "<date>"
+#~ msgstr "<date>"
+
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Impossibile ricaricare l'intestazione della firma\n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "Repackaging..."
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr "Repackaging dei file rimossi..."
+
+#~ msgid "Upgrading..."
+#~ msgstr "Aggiornamento in corso..."
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "Aggiornamento pacchetti in corso..."
+
+#~ msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
+#~ msgstr "Rollback dei pacchetti (+%d/-%d) fino a %-24.24s (0x%08x):\n"
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "Ripristino di %s\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "errore durante la lettura dell'intestazione dal pacchetto\n"
+
#~ msgid "========== recording tsort relations\n"
#~ msgstr "========== registrazione relazioni tsort\n"
diff --git a/po/ja.po b/po/ja.po
index 6cd069fc8..cac2d466a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm-4.4\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2005-04-04 22:30+1000\n"
"Last-Translator: SEKINE Tatsuo <tsekine@sdri.co.jp>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -91,166 +91,166 @@ msgstr "ѥåΥإåɤ߹˥顼\n"
msgid "cannot re-open payload: %s\n"
msgstr "ڥɤƥץǤޤ: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "䤤碌ץ (-q ޤ --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "ڥץ (-V ޤ --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr "ץ (--query ޤ --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr "եĥ꡼õץ (--ftswalk):"
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "̾ץ:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "ǡ١ץ:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "[ <specfile> | <tarball> | <source package> ] ȤΥӥɥץ:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "󥹥ȡ/åץ졼/󥤥󥹥ȡ륪ץ:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "⡼ɡޥɤǶ̤Υץ:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM С %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "Υץ GNU GPL βǼͳۤǤޤ\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr " (%d) Ǥ顼 :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "ĤΥ᥸㡼⡼ɤΤߤꤷƲ"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "䤤碌/ڤϰ٤˰Ĥ¹ԤǤޤ"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "ͽ䤤碌Υե饰"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "ͽ䤤碌Υեޥå"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "ͽ䤤碌Υ"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"󥹥ȡ롢åץ졼ɡڥåեΤ߶Ǥ"
"ޤ"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "եϥѥå󥹥ȡˤΤߺ֤Ǥޤ"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr "--prefix --relocate --excludepath ȤƱˤϻѤǤޤ"
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate --excludepath Ͽѥå򥤥󥹥ȡ뤹Τ߻Ѥ"
"ޤ"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix ϿѥåΥ󥹥ȡΤ߻ѤǤޤ"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ΰ / ϤޤʤФʤޤ"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ϥѥå󥹥ȡΤ߻Ǥޤ"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent ϥѥå󥹥ȡΤ߻Ǥޤ"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ϥѥå󥹥ȡΤ߻Ǥޤ"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ϥѥå󥹥ȡΤ߻Ǥޤ"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ϥѥå󥹥ȡΤ߻Ǥޤ"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs --includedocs ƱˤϻǤޤ"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ϥѥå󥹥ȡΤ߻Ǥޤ"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos ϥѥå󥹥ȡΤ߻Ǥޤ"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize ϥѥå󥹥ȡΤ߻Ǥޤ"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ϥѥåΤ߻Ǥޤ"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ϥѥå󥹥ȡΤ߻Ǥޤ"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ϥѥå󥹥ȡ롦Τ߻Ǥޤ"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -258,7 +258,7 @@ msgstr ""
"ץȤ̵ˤ褦ʥץϡѥåΥ󥹥ȡ롦"
"߻Ǥޤ"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -266,7 +266,7 @@ msgstr ""
"ȥꥬ̵ˤ褦ʥץϥѥå󥹥ȡ롦Τ߻"
"Ǥޤ"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -274,13 +274,13 @@ msgstr ""
"--nodeps ϥѥå/ӥ/ꥳѥ/󥹥ȡ//ڻΤ"
"Ǥޤ"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test ϥѥåΥ󥹥ȡ//Τ߻Ǥޤ"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -288,82 +288,82 @@ msgstr ""
"--root (-r) ϥ󥹥ȡ//䤤碌/ǡ١ƹۻΤ߻Ǥ"
""
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ΰ / ϤޤʤФʤޤ"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "̾ե뤬ޤ\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "ե %s ˥Ǥޤ\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp դޤ: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "ѥե졼: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "ѥե졼Υå˼Ԥޤ\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "ѥե졼Ǥ\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "ޥե̵ %%_signature ꡣ\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign ϥѥåΤ߻Ǥޤ"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "¹Լ\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "ӥɤѥåꤵƤޤ"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "ӥɤΤ spec ե뤬ꤵƤޤ"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "ӥɤΤ tar ե뤬ꤵƤޤ"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "󥤥󥹥ȡ뤹ѥåꤵƤޤ"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "󥹥ȡ뤹ѥåꤵƤޤ"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "䤤碌ΤΰꤵƤޤ"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "ڤΤΰꤵƤޤ"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "ꤵƤޤ"
@@ -580,7 +580,7 @@ msgstr "եƬ \"/\" ɬפǤ: %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob ϵĤƤޤ: %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "ե뤬Ĥޤ (by glob): %s\n"
@@ -749,7 +749,7 @@ msgstr "̾إåκɤ߹ߤǤޤ\n"
msgid "Could not open %s: %s\n"
msgstr "%s Υץ˼: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "ѥåν񤭹ߤ˼: %s\n"
@@ -1273,17 +1273,17 @@ msgstr "ӥɰ¸򸡾ڤʤ"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr "(Ť) rpm[23] ѥå󥰸ߴΥإå"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "ѥåȤθڤ򤷤ޤ"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "ǡ١إå򸡾ڤޤ"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "ѥå̾θڤ򤷤ޤ"
@@ -1325,7 +1325,7 @@ msgstr "(Ť) rpm[23] ѥå󥰸ߴΥإåޤ"
msgid "Couldn't exec %s: %s\n"
msgstr "%s ¹ԤǤޤǤ: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, fuzzy, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "%s Υץ˼: %s\n"
@@ -1823,39 +1823,31 @@ msgstr "URL åϥɥ󥰤ΥǥХå"
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: ץơ֥꤬ޤ (%d)\n"
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "ѥ / ϤޤʤФʤޤ"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "֤ / ϤޤʤФʤޤ"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "֤ = ޤǤʤФʤޤ"
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "֤ = μ / ǤʤФʤޤ"
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr "Хåˤ/凉פλ꤬ɬפǤ"
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr "Хåλ/եפηޤ"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr "ȥ󥶥ƥѥåɲäޤ"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr "꤬åפؼƤƤ⡢ե򥤥󥹥ȡ뤷ޤ"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1863,156 +1855,152 @@ msgstr ""
"<package> ȰפѥåƤޤ(̾ <package> ʣΥѥ"
"ؤϥ顼ˤʤޤ)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "ѥåΥץȤ¹Ԥޤ"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr "ԲǽʥѥåΥե֤ޤ"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr "¸Υ롼פٹȤɽޤ"
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr "줿ѥå򡢥֥ǥ쥯ȥ̾Ѥ¸ޤ"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "ѥå (󥤥󥹥ȡ) ޤ"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "ե򥤥󥹥ȡ뤷ޤ"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "ɥȤ򥤥󥹥ȡ뤷ޤ"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "ѥ <path> Υե򥹥åפޤ"
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<path>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr "ѥå֤ǤΥեζΤޤ"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "--replacepkgs --replacefiles ṳ̂"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "˥󥹥ȡѤߤξΤߥåץ졼"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<packagefile>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr ""
"ѥå򥤥󥹥ȡˤĤ '#' ɽޤ (-v ȻѤɤ)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "ѥåоݥƥ򸡾ڤޤ"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "ѥåо OS θڤԤޤ"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "󥹥ȡΥǥ̥åԤޤ"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "ɥȤ򥤥󥹥ȡ뤷ޤ"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "ѥå򥤥󥹥ȡ뤷ޤ"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "ǡ١򹹿ޤե륷ƥѹϹԤޤ"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "ѥåΰ¸طθڤԤޤ"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "ե MD5 Ȥ򸡾ڤޤ"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr "եΥƥƥȤ򥤥󥹥ȡ뤷ޤ"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr "¸٤ΥѥåΥ󥹥ȡѹޤ"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr "­¸طβƤޤ"
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "%%pre ץȤ¹Ԥޤ"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "%%post ץȤ¹Ԥޤ"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "%%preun ץȤ¹Ԥޤ"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun ץȤ¹Ԥޤ"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "Υѥåˤäƥȥꥬ륹ץȤ¹Ԥޤ"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "%%triggerprein ץȤ¹Ԥޤ"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "%%triggerin ץȤ¹Ԥޤ"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "%%triggerun ץȤ¹Ԥޤ"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "%%triggerpostun ץȤ¹Ԥޤ"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2020,53 +2008,39 @@ msgstr ""
"ŤСΥѥå˥åץ졼ɤޤ(åץ졼ɻ --force "
"ϤưŪ˹Ԥޤ)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "󥹥ȡ뤹ݤ˥ѡɽԤޤ"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "ѥåֲǽʤС <dir> ˺֤ޤ"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "ѥ <old> ѥ <new> ˥ե֤ޤ"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "ƥѥå뤳ȤǺѥå¸ޤ"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr "ѥå֤Υեζ̵뤷ޤ"
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "¸ߤѥåǤƥ󥹥ȡ뤷ޤ"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-"<date> ξ֤᤹ᡢѥåŤѥåƥ"
-"ȡ뤷ޤ"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<date>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr "󥹥ȡ뤻ˡƥȤΤߤԤޤ"
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "ѥå򥢥åץ졼ɤޤ"
@@ -2282,54 +2256,50 @@ msgstr "ѥå˽̾ (--addsign ƱǤ)"
msgid "generate signature"
msgstr "̾ޤ"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "ѥåԤޤϥХʥѥåǤ\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "ѥå .spec ե뤬ޤ\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
"%s(%s-%s-%s.%s) ץȤμ¹Ԥ˼Ԥޤwaitpid (%d)rc %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s(%s-%s-%s.%s) ץȤμ¹Ԥ˼Ԥޤλơ %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "%s(%s-%s-%s.%s) ץȤμ¹Ԥ˼Ԥޤλơ %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: ץ %s μ¹Ԥ˼Ԥޤ (%d)%s 򥹥åפޤ\n"
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "̾إåκɤ߹ߤǤޤ\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "֤οĹ˼%s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr ": ե "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s: ե %s Ǽ: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s: : %s\n"
@@ -2430,7 +2400,7 @@ msgstr "̵ʥѥåֹ: %s\n"
msgid "record %lu could not be read\n"
msgstr "쥳 %u ɤ߹ޤǤ\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "ѥå %s ϥ󥹥ȡ뤵Ƥޤ\n"
@@ -2582,8 +2552,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "lua ץȤݡȡ"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2594,104 +2564,74 @@ msgstr "%s Υץ˼: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "ʥ: \"%s\"\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "¸ηǡ:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "ѥå󥹥ȡν..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "ƥѥå..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr "줿եκƥѥå..."
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "åץ졼..."
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "ѥå򥢥åץ졼..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "%s \n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s 򥹥åפޤ - ž˼ - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s 򥤥󥹥ȡǤޤ\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, c-format
msgid "package %s is not relocatable\n"
msgstr "ѥå %s Ϻ֤Ǥޤ\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "ե %s ɤ߹ߥ顼\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ե %s ˤϤ꿷С RPM ɬפǤ\n"
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: RPM ѥå(ޤϥѥåΥꥹ)ǤϤޤ: %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ե %s 򥪡ץǤޤ: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ʣΥѥåꤷƤޤ\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s 򥪡ץǤޤ: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "%s 򥤥󥹥ȡǤ\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr "ѥå (+%d/-%d) %-24.24s إХå(0x%08x):\n"
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr "ƥѥå줿ѥå:\n"
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr "\t%s :\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3048,56 +2988,6 @@ msgstr "MD5 Ȥ»: ݡȤƤޤ\n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr "̾: ̤(%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr "ȥ󥶥˼Ԥޤ...Хå\n"
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr "ưХåȥ󥶥դǤޤǤ!\n"
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr "󥹥ȡǥǡ١Υ󥹥󥹤ǤޤǤ!\n"
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr "ưХåȥ󥶥ΥإåǤޤǤ\n"
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr "\t󥹥ȡ %s ɲäޤ\n"
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-"ưХåȥ󥶥κƥѥåإåǤޤǤ!\n"
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr "ưХåȥ󥶥˺ǤɲäǤޤ\n"
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr "ƥѥå줿ѥåɤ߹ߤ˼Ԥޤ!\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr "ɲä˼Ԥޤѥåإåɤ߹ޤǤ\n"
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr "rpmpsmStage() ɲä˼Ԥޤ\n"
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr "ɲä˼ԤޤեμǤޤ\n"
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr "rpmpsmStage() Ǻ˼Ԥޤ\n"
-
#: lib/verify.c:274
#, c-format
msgid "missing %c %s"
@@ -3248,142 +3138,142 @@ msgstr ""
msgid "verify database files"
msgstr "ǡ١θڤԤޤ"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: ʥ̾: \"%s\" ̵뤷ޤ\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "%s ǥå db%d ǥץǤޤ - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "%s ǥå򥪡ץǤޤ\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "dbpath ꤵƤޤ\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "顼(%d) - 쥳 \"%s\" (%s ǥå)\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: åפޤ"
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "顼(%d) - 쥳 #%d %s ˳Ǽ\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek ˼Ԥޤ: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: ץ˼Ԥޤ: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: åפޤ"
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
"rpmdb: »إå󥹥 #%u ޤåפޤ\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: إåɤळȤǤޤ (0x%x)\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "顼(%d) - إå #%d 쥳ɤ %s κ\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "顼(%d) - \"%s\" Υ쥳 (%s ǥå)\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "顼(%d) - 쥳 \"%s\" %s ˳Ǽ\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "顼(%d) - 쥳 \"%s\" %s \n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "顼(%d) - ѥå󥹥󥹤γƻ\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr "rpmdbAdd: åפޤ"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "顼(%d) - 쥳 %s %s ˥ȥ\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "dbpath ꤵƤޤ"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "Ūʥǡ١ %s ϴ¸ߤƤޤ\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "ǥ쥯ȥ %s κ: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "ǡ١Υإå #%u Ǥ -- åפޤ\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr " %u ˤä쥳ɤɲäǤޤ\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr "ǡ١κƹۤ˼: ꥸʥΥǡ١ϻĤäƤޤ\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "Ťǡ١򿷤ǡ١֤Τ˼!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "ˤ %s Υե %s Υե֤Ʋ"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "ǥ쥯ȥ %s κ: %s\n"
@@ -3626,6 +3516,88 @@ msgstr "%s: å˼Ԥޤ: ec %d\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: manifest ɤ߹ߤ˼: %s\n"
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr "Хåˤ/凉פλ꤬ɬפǤ"
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "Хåλ/եפηޤ"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr "줿ѥå򡢥֥ǥ쥯ȥ̾Ѥ¸ޤ"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "ƥѥå뤳ȤǺѥå¸ޤ"
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr ""
+#~ "<date> ξ֤᤹ᡢѥåŤѥåƥ"
+#~ "ȡ뤷ޤ"
+
+#~ msgid "<date>"
+#~ msgstr "<date>"
+
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "̾إåκɤ߹ߤǤޤ\n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "ƥѥå..."
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr "줿եκƥѥå..."
+
+#~ msgid "Upgrading..."
+#~ msgstr "åץ졼..."
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "ѥå򥢥åץ졼..."
+
+#~ msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
+#~ msgstr "ѥå (+%d/-%d) %-24.24s إХå(0x%08x):\n"
+
+#~ msgid "Cleaning up repackaged packages:\n"
+#~ msgstr "ƥѥå줿ѥå:\n"
+
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "\t%s :\n"
+
+#~ msgid "Transaction failed...rolling back\n"
+#~ msgstr "ȥ󥶥˼Ԥޤ...Хå\n"
+
+#~ msgid "Could not order auto-rollback transaction!\n"
+#~ msgstr "ưХåȥ󥶥դǤޤǤ!\n"
+
+#~ msgid "Could not get install element database instance!\n"
+#~ msgstr "󥹥ȡǥǡ١Υ󥹥󥹤ǤޤǤ!\n"
+
+#~ msgid "Could not get header for auto-rollback transaction!\n"
+#~ msgstr "ưХåȥ󥶥ΥإåǤޤǤ\n"
+
+#~ msgid "\tAdded from install element %s.\n"
+#~ msgstr "\t󥹥ȡ %s ɲäޤ\n"
+
+#~ msgid "Could not get repackaged header for auto-rollback transaction!\n"
+#~ msgstr ""
+#~ "ưХåȥ󥶥κƥѥåإåǤޤǤ"
+#~ "!\n"
+
+#~ msgid "Could not add erase element to auto-rollback transaction.\n"
+#~ msgstr "ưХåȥ󥶥˺ǤɲäǤޤ\n"
+
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "ƥѥå줿ѥåɤ߹ߤ˼Ԥޤ!\n"
+
+#~ msgid "Add failed. Could not read package header.\n"
+#~ msgstr "ɲä˼Ԥޤѥåإåɤ߹ޤǤ\n"
+
+#~ msgid "Add failed in rpmpsmStage().\n"
+#~ msgstr "rpmpsmStage() ɲä˼Ԥޤ\n"
+
+#~ msgid "Add failed. Could not get file list.\n"
+#~ msgstr "ɲä˼ԤޤեμǤޤ\n"
+
+#~ msgid "Erase failed failed in rpmpsmStage().\n"
+#~ msgstr "rpmpsmStage() Ǻ˼Ԥޤ\n"
+
#, fuzzy
#~ msgid "\twaitpid(%d) rc %d status %x\n"
#~ msgstr "%s: waitpid(%d) rc %d %x %u.%03u\n"
diff --git a/po/ko.po b/po/ko.po
index 21d82a175..d465a1804 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\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"
@@ -80,179 +80,179 @@ msgstr "Ű д ߻߽ϴ\n"
msgid "cannot re-open payload: %s\n"
msgstr "payload ٽ : %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr " ɼ (-q Ǵ --query ɼǰ Բ ):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr " ɼ (-V Ǵ --verify ɼǰ Բ ):"
-#: rpmqv.c:85
+#: rpmqv.c:83
#, fuzzy
msgid "Source options (with --query or --verify):"
msgstr " ɼ (-V Ǵ --verify ɼǰ Բ ):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr " ɼ:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "ͺ̽ ɼ:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
" Բ ϴ ɼ [ <spec> | <tar> | <ҽ Ű> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "ġ/׷̵/ ɼ:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
#, fuzzy
msgid "Common options for all rpm modes and executables:"
msgstr " rpm 忡 Ϲ ɼ:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM - %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, fuzzy, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr " α׷ GNU Public License Ӱ ֽϴ"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "μ ó (%d) ߻߽ϴ :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "ϳ (major) 常 ֽϴ"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "/ ٸ ÿ ֽϴ"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr " ÷ Դϴ"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr " Դϴ"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr " ҽ Դϴ"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "ġ, ׷̵, ҽ , spec ÿ ˴ϴ"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "Ű ġÿ ġ ֽϴ"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate --excludepath ɼ ֽ Ű ġ "
"ϴ"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix ɼ ֽ Ű ġ ֽϴ"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ɼ μ ݵ '/' ؾ մϴ"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ɼ Ű ġÿ ֽϴ"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent ɼ Ű ġÿ ֽϴ"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ɼ Ű ġÿ ֽϴ"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ɼ Ű ġÿ ֽϴ"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ɼ Ű ġÿ ֽϴ"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs --includedocs ɼǸ ֽϴ"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ɼ Ű ġÿ ֽϴ"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos ɼ Ű ġÿ ֽϴ"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize ɼ Ű ġÿ ֽϴ"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ɼ Ű ÿ ֽϴ"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ɼ Ű ġÿ ֽϴ"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ɼ Ű ġ ÿ ֽϴ"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "ũƮ ɼ Ű ġ ÿ ֽϴ"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "Ʈ ɼ Ű ġ ÿ ֽϴ"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -260,13 +260,13 @@ msgstr ""
"--nodeps ɼ Ű , (rebuild), (recompile), ġ, "
", ÿ ֽϴ"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test ɼ Ű ġ, , ۽ÿ ֽϴ"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -274,82 +274,82 @@ msgstr ""
"--root (-r) ɼ Ű ġ, , , ͺ̽ 籸ÿ "
" ֽϴ"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ɼ μ ݵ '/' ؾ մϴ"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr " ϴ\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "%s Ͽ ϴ\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp ã : "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "н (pass phrase) Է: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "н (pass phrase) ùٸ ʽϴ\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "н (pass phrase) ġմϴ.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "ũ Ͽ %%_signature ֽϴ.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign ɼ Ű ۽ÿ ֽϴ"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "࿡ ߽ϴ\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "(rebuild) Ű ʾҽϴ"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "Ű ۿ ʿ spec ʾҽϴ"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "Ű ۿ ʿ tar ʾҽϴ"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr " Ű ʾҽϴ"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "ġ Ű ʾҽϴ"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "ǿ ʿ μ ʾҽϴ"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr " ʿ μ ʾҽϴ"
-#: rpmqv.c:802
+#: rpmqv.c:792
#, fuzzy
msgid "no arguments given"
msgstr "ǿ ʿ μ ʾҽϴ"
@@ -567,7 +567,7 @@ msgstr " \"/\" ؾ: %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob : %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "glob ã : %s\n"
@@ -734,7 +734,7 @@ msgstr "(signature) ٽ о ϴ.\n"
msgid "Could not open %s: %s\n"
msgstr "%s() : %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Ű ۼ : %s\n"
@@ -1260,19 +1260,19 @@ msgstr "Ű ˻ ʽϴ"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr "() rpm[23] Ű¡ ȣȯϴ Ű մϴ"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "Ű ˻ ʽϴ"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
#, fuzzy
msgid "don't verify database header(s) when retrieved"
msgstr "Ű Űĸ ˻ ʽϴ"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
#, fuzzy
msgid "don't verify package signature(s)"
@@ -1315,7 +1315,7 @@ msgstr "() rpm[23] Ű¡ ȣȯϴ մϴ"
msgid "Couldn't exec %s: %s\n"
msgstr "%s() : %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "%s() fork : %s\n"
@@ -1821,42 +1821,34 @@ msgstr "URL ij ڵ鸵 մϴ"
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "ܽų δ ݵ '/' ؾ մϴ"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "ġÿ ݵ '/' ؾ մϴ"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "ġÿ ݵ '=' ؾ մϴ"
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "ġÿ ݵ '=' ڿ '/' ; մϴ"
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr "ѹ(rollback) μ ð/¥ Դϴ"
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr "ѹ(rollback) μ ð/¥ ùٸ ʽϴ"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
#, fuzzy
msgid "add suggested packages to transaction"
msgstr "ġ Ű / մϴ"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"Ư ϱ 쿡, Ű "
"ġմϴ"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1864,164 +1856,160 @@ msgstr ""
"<Ű> ̸ ġϴ Ű մϴ (<Ű> Ű"
" ÿ 쿡 ߻մϴ)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "Ű ũƲ(scriptlet) ʽϴ"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr "ġ Ű ġϿ ġմϴ"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr "Ϻ-丮 ̸ Ű մϴ"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "Ű () մϴ"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<Ű>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr " մϴ"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "Ű Ե ġ ʽϴ"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "<> ۵Ǵ ġ ʽϴ "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr "ġ Ű ġϿ ġմϴ"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "--replacepkgs --replacefiles ɼ ÿ մϴ"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr " ġ Ű ׷̵ մϴ"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<Ű>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr ""
"Ű ġ ؽøũ(#) ǥմϴ (-v ɼǰ Բ ϴ "
")"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "Ű Űĸ ˻ ʽϴ"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "Ű ü ˻ ʽϴ"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "Ű ġϱ ũ ˻ ʽϴ"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "Ű Ե ġմϴ"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
#, fuzzy
msgid "install package(s)"
msgstr "Ű ġմϴ"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "Ͻý ʰ, ͺ̽ մϴ"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "Ű ˻ ʽϴ"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr " MD5 (digest) ˻ ʽϴ"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
#, fuzzy
msgid "don't install file security contexts"
msgstr " մϴ"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr " ִ Ű ġϵ 䱸 ʽϴ"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "%%pre ũƲ(scriptlet) ʽϴ ( )"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "%%post ũƲ(scriptlet) ʽϴ ( )"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "%%preun ũƲ(scriptlet) ʽϴ ( )"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun ũƲ(scriptlet) ʽϴ ( )"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
" Ű Ǵ(triggered)  ũƲ(scriptlet) "
"ʽϴ"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr " %%triggerprein ũƲ(scriptlet) ʽϴ"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr " %%triggerin ũƲ(scriptlet) ʽϴ"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr " %%triggerun ũƲ(scriptlet) ʽϴ"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr " %%triggerpostun ũƲ(scriptlet) ʽϴ"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2029,52 +2017,40 @@ msgstr ""
" Ű ٿ׷̵ մϴ (--force ɼ ÿ ɼ"
" ڵ ˴ϴ)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "Ű ġ ۼƮ(%) ǥմϴ"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"ġ ִ Ű , <丮> ġϿ ġմϴ"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<丮>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "<> <ο> ġ մϴ"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<>=<ο>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "Ű¡(repackaging) Ǵ Ű մϴ"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "Ű ̹ ġǾ ִ 쿡 ġմϴ"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr " ġ , ġ 缳ġ, Ű, <¥> (back to date)"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<¥>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr "Ű ġ ʰ, ġǴ Ȯմϴ"
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "Ű ׷̵ մϴ"
@@ -2304,60 +2280,55 @@ msgstr "Ű մϴ ( ˴ϴ)"
msgid "generate signature"
msgstr " ۼմϴ"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "ҽ Ű ʿϸ, ̳ʸ ˻Ǿϴ\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "ҽ Ű .spec ԵǾ ʽϴ\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
"%s: %s ũƲ(scriptlet) ߽ϴ (%d), %s-%s-%s() մϴ\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr ""
"%2$s-%3$s-%4$s %1$s ũƲ(scriptlet) ࿡ ߽ϴ, Ȳ %5"
"$d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr ""
"%2$s-%3$s-%4$s %1$s ũƲ(scriptlet) ࿡ ߽ϴ, Ȳ %5"
"$d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, fuzzy, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
"%s: %s ũƲ(scriptlet) ߽ϴ (%d), %s-%s-%s() մϴ\n"
-#: lib/psm.c:1581
-#, fuzzy
-msgid "Unable to reload signature header\n"
-msgstr "(signature) ٽ о ϴ.\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "ī̺긦 Ǫµ %s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%2$s %1$s() : %3$s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s() : %s\n"
@@ -2459,7 +2430,7 @@ msgstr " Ű ȣ: %s\n"
msgid "record %lu could not be read\n"
msgstr "(record) ȣ %u() ϴ\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "%s Ű ġǾ ʽϴ\n"
@@ -2611,8 +2582,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "'-' ڿ ϴ\n"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2623,108 +2594,75 @@ msgstr "%s() µ : %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr " ± Դϴ"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
#, fuzzy
msgid "Failed dependencies:\n"
msgstr " :\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "غ ..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "ġ Ű غϰ ֽϴ..."
-#: lib/rpminstall.c:178
-#, fuzzy
-msgid "Repackaging..."
-msgstr "غ ..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr ""
-
-#: lib/rpminstall.c:199
-#, fuzzy
-msgid "Upgrading..."
-msgstr "غ ..."
-
-#: lib/rpminstall.c:201
-#, fuzzy
-msgid "Upgrading packages..."
-msgstr "Ű ׷̵ մϴ"
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "%s() մϴ\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s() մϴ - (transfer) - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s() ġ ϴ\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "%s Ű ġ ϴ\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "%s д ߻߽ϴ\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "%s ֽ RPM ʿ մϴ\n"
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, fuzzy, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s() ġϴ Ű : %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s : %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" Ű մϴ\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s() : %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "%s() ġմϴ\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr "%s() մϴ\n"
-
#: lib/rpmlead.c:100
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
@@ -3083,56 +3021,6 @@ msgstr "ջ MD5 (digest): \n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr ": size(%d)+pad(%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr "Ű д ߻߽ϴ\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3283,148 +3171,148 @@ msgstr ""
msgid "verify database files"
msgstr "ͺ̽ ˻մϴ"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
"DB ± ʱȭ[dbiTagsInit]: ± ̸: \"%s\"() õ˴"
"\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "db%2$d() ̿Ͽ %1$s ε ϴ - %3$s (%4$d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "%s ε ϴ\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "dbΰ Ǿ ʽϴ\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
"%3$s ε \"%2$s\" ڵ带 (%1$d) ߻߽ϴ\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "%3$s() %2$s ڵ带 ϴ (%1$d) ߻߽ϴ\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek ߽ϴ: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: µ ߽ϴ: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, fuzzy, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: ջ #%u() (retrieved)Ǿϴ, մϴ.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%x ϴ\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
"%3$s ε \"%2$s\" ڵ带 (%1$d) ߻߽ϴ\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
"%3$s ε \"%2$s\" ڵ带 (%1$d) ߻߽ϴ\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "%3$s() %2$s ڵ带 ϴ (%1$d) ߻߽ϴ\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "%3$s %2$s ڵ带 ϴ (%1$d) ߻߽ϴ\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "ο Ű ġϴ (%d) ߻߽ϴ\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
#, fuzzy
msgid "rpmdbAdd: skipping"
msgstr "rpmdb: ջ #%u() (retrieved)Ǿϴ, մϴ.\n"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "%3$s() %2$s ڵ带 ϴ (%1$d) ߻߽ϴ\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "dbΰ Ǿ ʽϴ"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "ӽ ͺ̽ %s() ̹ մϴ\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "%s 丮 ϴµ : %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, fuzzy, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "ͺ̽ ڵ ȣ %u() ߸Ǿϴ -- մϴ.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "%u ó ڵ带 ߰ ϴ\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ͺ̽ 籸ϴµ : ͺ̽ ״ ˴ϴ\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr " ͺ̽ ο ͺ̽ üϴµ ߽ϴ!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "ϱ %2$s %1$s Ϸ üմϴ"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "%s 丮 ϴµ : %s\n"
@@ -3670,6 +3558,48 @@ msgstr "%s: µ ߽ϴ: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: дµ ߽ϴ: %s\n"
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr "ѹ(rollback) μ ð/¥ Դϴ"
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "ѹ(rollback) μ ð/¥ ùٸ ʽϴ"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr "Ϻ-丮 ̸ Ű մϴ"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "Ű¡(repackaging) Ǵ Ű մϴ"
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr " ġ , ġ 缳ġ, Ű, <¥> (back to date)"
+
+#~ msgid "<date>"
+#~ msgstr "<¥>"
+
+#, fuzzy
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "(signature) ٽ о ϴ.\n"
+
+#, fuzzy
+#~ msgid "Repackaging..."
+#~ msgstr "غ ..."
+
+#, fuzzy
+#~ msgid "Upgrading..."
+#~ msgstr "غ ..."
+
+#, fuzzy
+#~ msgid "Upgrading packages..."
+#~ msgstr "Ű ׷̵ մϴ"
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "%s() մϴ\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "Ű д ߻߽ϴ\n"
+
#~ msgid "========== recording tsort relations\n"
#~ msgstr "========== tsort 踦 (record)մϴ\n"
diff --git a/po/nb.po b/po/nb.po
index f6ee1abfe..0663667ac 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\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"
@@ -80,164 +80,164 @@ msgstr "feil under lesing av header fra pakke\n"
msgid "cannot re-open payload: %s\n"
msgstr "kan ikke gjenpne \"payload\": %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr ""
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr ""
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr ""
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versjon %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, fuzzy, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr ""
"Dette progeammet kan redistribueres fritt under betingelsene gitt i GNU GPL"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "kun ett strre modi kan spesifiseres"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "n type sprring/verifisering kan utfres om gangen"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "uventede flagg for sprring"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "ventet sprringsformat"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "uventet sprringskilde"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "filer kan kun omplasseres under pakkeinstallasjon"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate og --excludepath kan kun brukes ved installasjon av nye pakker"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "argumenter til --prefix m begynne med en /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -245,7 +245,7 @@ msgstr ""
"skript som slr av alternativer kan kun spesifiseres under pakkeinstallasjon "
"og sletting"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -253,101 +253,101 @@ msgstr ""
"alternativer som slr av utlsing kan kun spesifiseres under "
"pakkeinstallasjon, og sletting"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "ingen filer signere\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "kan ikke aksessere fil %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp ikke funnet: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Skriv inn passord: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Passordsjekk feilet\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Passord er ok.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "kjring feilet\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler oppgitt for ombygging"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "ingen spec-fil oppgitt for bygging"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "ingen tar-fil oppgitt for bygging"
-#: rpmqv.c:718
+#: rpmqv.c:715
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker oppgitt for installering"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "ingen pakker oppgitt for installering"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "ingen argumenter oppgitt for sprring"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "ingen argumenter oppgitt for verifisering"
-#: rpmqv.c:802
+#: rpmqv.c:792
#, fuzzy
msgid "no arguments given"
msgstr "ingen argumenter oppgitt for sprring"
@@ -565,7 +565,7 @@ msgstr ""
msgid "Glob not permitted: %s\n"
msgstr "linje %d: Filnavn ikke tillatt: %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -735,7 +735,7 @@ msgstr "Kunne ikke pne spec fil %s: %s\n"
msgid "Could not open %s: %s\n"
msgstr "Kunne ikke pne %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Kunne ikke skrive pakke: %s\n"
@@ -1263,19 +1263,19 @@ msgstr "ikke verifiser pakkeavhengigheter"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "ikke verifiser pakkeavhengigheter"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
#, fuzzy
msgid "don't verify database header(s) when retrieved"
msgstr "ikke verifiser pakkearkitektur"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
#, fuzzy
msgid "don't verify package signature(s)"
@@ -1318,7 +1318,7 @@ msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker"
msgid "Couldn't exec %s: %s\n"
msgstr "Kunne ikke kjre %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "klarte ikke pne %s: %s\n"
@@ -1814,40 +1814,32 @@ msgstr "feilsk URL-cache hndtering"
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "eksluderingssti m begynne med en /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "relokasjoner m begynne med en /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "relokasjoner m inneholde et ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "relokasjoner m ha et / etter ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
#, fuzzy
msgid "add suggested packages to transaction"
msgstr "spr/verifiser pakke(r) i gruppe"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr "installer alle filer, selv konfigurasjoner som ellers kan hoppes over"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1855,160 +1847,156 @@ msgstr ""
"fjern alle pakker som er lik <pakke> (normalt vil en feil genereres hvis "
"<pakke> spesifiserer flere pakker)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "ikke kjr pakkespesifikke skriptlet"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr "omplasser filer i ikke-omplasserbar pakke"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr "lagre slettede pakkefiler ved endre navn til underkatalog"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "slett (avinstaller) pakke"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<pakke>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr "ikke installer dokumentasjon"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "ikke installer dokumentasjon"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "hopp over filer med innledende komponent <sti> "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<sti>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr "omplasser filer i ikke-omplasserbar pakke"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "forkortning for --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "oppgrader pakke(r) hvis allerede installert"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<pakkefil>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "skriv ut skigarder etter som pakken installeres (nyttig med -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "ikke verifiser pakkearkitektur"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "ikke verifiser operativsystem for pakken"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "ikke sjekk diskplass fr installasjon"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "installer dokumentasjon"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
#, fuzzy
msgid "install package(s)"
msgstr "installer pakke"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "oppdater databasen, men ikke modifiser filsystemet"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "ikke verifiser pakkeavhengigheter"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:206
#, fuzzy
msgid "don't install file security contexts"
msgstr "ikke installer dokumentasjon"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr "ikke ordne pakkeinstallasjon for tilfredsstille avhengigheter"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "ikke kjr noen %%pre skriptlet (hvis noen)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "ikke kjr %%post skriptlet (hvis noen)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "ikke kjr %%preun skriptlet (hvis noen)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "ikke kjr %%postun skriptlet (hvis noen)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "Ikke kjr noen skriptlets som utlses av denne pakken"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "ikke kjr %%triggerprein skriptlets"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "ikke kjr %%triggerin skriptlets"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "ikke kjr %%triggerun skriplets"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "ikke kjr %%triggerpostun skriptlets"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2016,52 +2004,39 @@ msgstr ""
"oppgrader til en gammel versjon av pakken (--force ved oppgraderinger gjr "
"dette automatisk)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "omplasser pakken til <kat>, hvis den er omplasserbar"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<kat>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "omplasser filer fra sti <gml> til <ny>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<gml>=<ny>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "lagre slettede pakkefiler ved ompakking"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "reinstaller selv om pakken allerede er installert"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-
-#: lib/poptI.c:298
-#, fuzzy
-msgid "<date>"
-msgstr "<sti>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
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:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "oppgrader pakke(r)"
@@ -2294,54 +2269,49 @@ msgstr "signer en pakke (forkast nvrende signatur)"
msgid "generate signature"
msgstr "generer signatur"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "kildepakke forventet, binr funnet\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "kildepakke inneholder ikke en .spec-fil\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/psm.c:873
+#: lib/psm.c:863
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr ""
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1581
-#, fuzzy
-msgid "Unable to reload signature header\n"
-msgstr "Kunne ikke pne spec fil %s: %s\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr ""
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "klarte ikke pne %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s feilet\n"
@@ -2443,7 +2413,7 @@ msgstr "ugyldig pakkenummer: %s\n"
msgid "record %lu could not be read\n"
msgstr ""
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "pakke %s er ikke installert\n"
@@ -2591,8 +2561,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "- ikke stttet for strenger\n"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2603,108 +2573,75 @@ msgstr "feil under pning av %s: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "linje %d: Ukjent tagg: %s\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "feilede avhengigheter:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "Forbereder..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker for installasjon..."
-#: lib/rpminstall.c:178
-#, fuzzy
-msgid "Repackaging..."
-msgstr "Forbereder..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr ""
-
-#: lib/rpminstall.c:199
-#, fuzzy
-msgid "Upgrading..."
-msgstr "Forbereder..."
-
-#: lib/rpminstall.c:201
-#, fuzzy
-msgid "Upgrading packages..."
-msgstr "oppgrader pakke(r)"
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Henter %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hopper over %s - overfring feilet - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, 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:577
+#: lib/rpminstall.c:539
#, fuzzy, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "ingen pakke utlser %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" spesifiserer flere pakker\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke pne %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr "Henter %s\n"
-
#: lib/rpmlead.c:100
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
@@ -3058,56 +2995,6 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr "feil under lesing av header fra pakke\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3255,141 +3142,141 @@ msgstr "gjenoppbygg database inverterte lister fra installerte pakkers headere"
msgid "verify database files"
msgstr ""
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "kan ikke pne %s-indeks ved bruk av db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "kan ikke pne %s indeks\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "feil(%d) under lagring av post %s til %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek feilet: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: pne feilet: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "feil(%d) under lagring av post %s til %s\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "feil(%d) under fjerning av post %s fra %s\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "feil(%d) under lagring av post %s til %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "feil(%d) under fjerning av post %s fra %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "feil(%d) under lagring av post %s til %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "kunne ikke opprette %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3633,6 +3520,40 @@ msgstr "%s: pne feilet: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: lesing av manifest feilet: %s\n"
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr "lagre slettede pakkefiler ved endre navn til underkatalog"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "lagre slettede pakkefiler ved ompakking"
+
+#, fuzzy
+#~ msgid "<date>"
+#~ msgstr "<sti>"
+
+#, fuzzy
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Kunne ikke pne spec fil %s: %s\n"
+
+#, fuzzy
+#~ msgid "Repackaging..."
+#~ msgstr "Forbereder..."
+
+#, fuzzy
+#~ msgid "Upgrading..."
+#~ msgstr "Forbereder..."
+
+#, fuzzy
+#~ msgid "Upgrading packages..."
+#~ msgstr "oppgrader pakke(r)"
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "Henter %s\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "feil under lesing av header fra pakke\n"
+
#, fuzzy
#~ msgid "%5d 0x%04x %s %s\n"
#~ msgstr "Fil %s: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 2f2e5e644..2a9f07460 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2008-03-07 21:24+0200\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -86,58 +86,58 @@ msgstr "błąd podczas odczytywania nagłówka z pakietu\n"
msgid "cannot re-open payload: %s\n"
msgstr "nie można ponownie otworzyć danych: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Opcje zapytania (z -q lub --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Opcje sprawdzania (z -V lub --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr "Opcje źródła (z --query lub --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr "Opcje przejścia tree plików (z --ftswalk):"
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Opcje podpisu:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Opcje bazy danych:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Opcje budowania z [ <plik spec> | <tarball> | <pakiet źródłowy> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Opcje instalowania/aktualizowania/usuwania:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "Wspólne opcje dla wszystkich trybów i binariów rpm:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM wersja %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -145,109 +145,109 @@ msgstr ""
"Ten program może być swobodnie rozpowszechniany na warunkach licencji GNU "
"GPL\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Wewnętrzny błąd w przetwarzaniu argumentu (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "może być podany tylko jeden główny tryb pracy"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "tylko jeden typ odpytywania/sprawdzania można wykonać na raz"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "nieoczekiwane flagi zapytania"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "nieoczekiwany format zapytania"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "nieoczekiwane źródło zapytania"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"tylko instalację, aktualizowanie i usuwanie źródeł oraz plików spec można "
"wymusić"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "przesuwania plików można dokonać tylko podczas instalacji"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr "nie można użyć --prefix z --relocate lub --excludepath"
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate i --excludepath można użyć tylko podczas instalacji nowych "
"pakietów"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix można użyć tylko podczas instalowania nowych pakietów"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty dla --prefix muszą rozpoczynać się od /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) można użyć tylko podczas instalacji pakietów"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent można użyć tylko podczas instalacji pakietów"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs można użyć tylko podczas instalacji pakietów"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs można użyć tylko podczas instalacji pakietów"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs można użyć tylko podczas instalacji pakietów"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "nie można jednocześnie użyć --excludedocs i --includedocs"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch można użyć tylko podczas instalacji pakietów"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos można użyć tylko podczas instalacji pakietów"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize można użyć tylko podczas instalacji pakietów"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches można użyć tylko podczas usuwania pakietów"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles można użyć tylko podczas instalacji pakietów"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb można użyć tylko podczas instalacji lub usuwania pakietów"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -255,7 +255,7 @@ msgstr ""
"opcje wyłączające skrypty można użyć tylko podczas instalacji lub usuwania "
"pakietów"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -263,7 +263,7 @@ msgstr ""
"opcje wyłączające triggery można użyć tylko podczas instalacji lub usuwania "
"pakietów"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -271,14 +271,14 @@ msgstr ""
"--nodeps można użyć tylko podczas budowania, przebudowywania, ponownej "
"kompilacji, instalacji, usuwania lub sprawdzania pakietów"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test można użyć tylko podczas instalacji, usuwania lub budowania pakietów"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -286,82 +286,82 @@ msgstr ""
"--root (-r) można użyć tylko podczas instalacji, usuwania, sprawdzania "
"pakietów lub przebudowywania bazy"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty dla --root (-r) muszą rozpoczynać się od /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "brak plików do podpisania\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "brak dostępu do pliku %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "nie znaleziono pgp: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Podaj długie hasło: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Sprawdzanie długiego hasła nie powiodło się\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Długie hasło jest dobre.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Nieprawidłowa specyfikacja %%_signature w pliku makra.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign można użyć tylko podczas budowania pakietu"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "wykonanie nie powiodło się\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "nie podano nazw pakietów do przebudowania"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "nie podano nazw plików spec do budowania"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "nie podano plików tar do zbudowania"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "nie podano pakietów do usunięcia"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "nie podano pakietów do zainstalowania"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "nie podano argumentów dla zapytania"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "nie podano argumentów dla sprawdzania"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "nie podano argumentów"
@@ -578,7 +578,7 @@ msgstr "Plik musi zaczynać się od \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob jest niedozwolony: %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Nie znaleziono pliku poprzez glob: %s\n"
@@ -747,7 +747,7 @@ msgstr "Nie można ponownie wczytać nagłówka podpisu.\n"
msgid "Could not open %s: %s\n"
msgstr "Nie można otworzyć %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Nie można zapisać pakietu: %s\n"
@@ -1274,17 +1274,17 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
"utwórz nagłówki pakietu kompatybilne z (przestarzałymi) pakietami rpm[23]"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "nie sprawdzaj skrótów pakietu"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "nie sprawdzaj nagłówków bazy danych po otrzymaniu"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "nie sprawdzaj podpisów pakietu"
@@ -1326,7 +1326,7 @@ msgstr "utwórz nagłówki kompatybilne z (przestarzałymi) pakietami rpm[23]"
msgid "Couldn't exec %s: %s\n"
msgstr "Nie można wykonać %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Nie można rozdzielić %s: %s\n"
@@ -1816,41 +1816,33 @@ msgstr "debuguj obsługę pamięci podręcznej URL-i"
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: tabela opcji jest błędnie skonfigurowana (%d)\n"
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "ścieżki wyłączeń muszą zaczynać się od /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "przesunięcia muszą zaczynać się od /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "przesunięcia muszą zawierać ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "przesunięcia muszą zawierać / po ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr "cofnięcie zmian przyjmuje argument w postaci znacznika czasu/daty"
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr "niesformowany argument znacznika czasu/daty dla cofnięcia zmian"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr "dodaj sugerowane pakiety do transakcji"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"zainstaluj wszystkie pliki, nawet konfiguracyjne, które w innym przypadku by "
"pominięto"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1858,155 +1850,151 @@ msgstr ""
"usuń wszystkie pakiety, które spełniają wzorzec <pakiet> (zazwyczaj "
"wyświetlany jest błąd, gdy <pakiet> opisuje wiele pakietów)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "nie wykonuj żadnych skryptów instalacyjnych"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr "przesuń pliki w nieprzesuwalnym pakiecie"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr "wyświetl pętle zależności jako ostrzeżenie"
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr "zapisz usuwane pliki z pakietu przenosząc do podkatalogu"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "usuń (odinstaluj) pakiet"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<pakiet>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "nie instaluj plików konfiguracyjnych"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "nie instaluj dokumentacji"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "pomiń pliki zaczynające się od <ścieżki> "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<ścieżka>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr "wykrywaj konflikty plików między pakietami"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "skrócona wersja --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "zaktualizuj pakiety, jeśli jest już zainstalowany"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<plik pakietu>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "wyświetl znaki hash podczas instalacji pakietów (dobre z -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "nie sprawdzaj architektury pakietu"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "nie sprawdzaj systemu operacyjnego pakietu"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "nie sprawdzaj pojemności dysku przed instalowaniem"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "zainstaluj dokumentację"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "zainstaluj pakiety"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "zaktualizuj bazę, ale nie modyfikuj systemu plików"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "nie sprawdzaj zależności pakietu"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "nie sprawdzaj skrótów MD5 plików"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr "nie instaluj kontekstów bezpieczeństwa plików"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr "nie zmieniaj kolejności instalacji pakietów, aby zapewnić zależności"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr "nie sugeruj sposobów spełnienia brakujących zależności"
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "nie wykonuj skryptu %%pre (jeśli jest)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "nie wykonuj skryptu %%post (jeśli jest)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "nie wykonuj skryptu %%preun (jeśli jest)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nie wykonuj skryptu %%postun (jeśli jest)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nie wykonuj żadnych skryptów aktywowanych przez ten pakiet"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nie wykonuj żadnych skryptów %%triggerprein"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nie wykonuj żadnych skryptów %%triggerin"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nie wykonuj żadnych skryptów %%triggerun"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nie wykonuj żadnych skryptów %%triggerpostun"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2014,51 +2002,39 @@ msgstr ""
"zaktualizuj do starej wersji pakietu (--force podczas aktualizowania robi to "
"automatycznie)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "wyświetl stan instalacji w procentach"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "przesuń pakiet do <katalogu>, jeśli jest przesuwalny"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<katalog>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "przesuń pliki ze <starej> ścieżki do <nowej>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<stara>=<nowa>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "zapisz usuwane pliki z pakietu poprzez ponowne pakowanie"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr "zignoruj konflikty plików między pakietami"
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "ponownie zainstaluj, jeśli pakiet jest już zainstalowany"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr "odinstaluj nowe, zainstaluj z powrotem stare pakiety aż do <daty>"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<data>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr "nie instaluj, podaj tylko czy instalacja zadziała czy nie"
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "zaktualizuj pakiety"
@@ -2273,53 +2249,49 @@ msgstr "podpisz pakiety (identyczne z --addsign)"
msgid "generate signature"
msgstr "utwórz podpis"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "spodziewany był pakiet źródłowy, znaleziono binarny\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "pakiet źródłowy nie zawiera pliku .spec\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "skrypt %s(%s-%s-%s.%s) nie powiódł się, waitpid(%d) rc %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "skrypt %s(%s-%s-%s.%s) nie powiódł się, sygnał %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "skrypt %s(%s-%s-%s.%s) nie powiódł się, stan wyjścia %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: skrypt %s nie powiódł się (%d), pomijanie %s\n"
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "Nie można ponownie wczytać nagłówka podpisu\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozpakowanie archiwum nie powiodło się%s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " na pliku "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s nie powiódł się na pliku %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s nie powiodło się: %s\n"
@@ -2420,7 +2392,7 @@ msgstr "nieprawidłowy numer pakietu: %s\n"
msgid "record %lu could not be read\n"
msgstr "nie można odczytać rekordu %lu\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
@@ -2569,8 +2541,8 @@ msgstr "skrypty pakietu mogą odwoływać się do bazy RPM-a podczas instalowani
msgid "internal support for lua scripts."
msgstr "wewnętrzna obsługa skryptów lua."
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2581,104 +2553,74 @@ msgstr "otwarcie %s nie powiodło się: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "nieznany znacznik: \"%s\"\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Niespełnione zależności:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "Przygotowywanie..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Przygotowywanie pakietów do instalacji..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "Ponowne pakowanie..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr "Ponowne pakowanie usuniętych plików..."
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "Aktualizowanie..."
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "Aktualizowanie pakietów..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Pobieranie %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "pomijanie %s - transmisja nie powiodła się - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie może zostać zainstalowany\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, c-format
msgid "package %s is not relocatable\n"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "błąd podczas odczytywania z pliku %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "plik %s wymaga nowszej wersji RPM-a\n"
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, c-format
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:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie można otworzyć pliku %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" określa wiele pakietów\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nie można otworzyć %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Instalowanie %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr "Cofnij pakiety (+%d/-%d) do %-24.24s (0x%08x):\n"
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr "Czyszczenie ponownie spakowanych pakietów:\n"
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr "\tUsuwanie %s\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3027,58 +2969,6 @@ msgstr "Uszkodzony skrót MD5: NIE OBSŁUGIWANY\n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Podpis: NIEZNANY (%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr "Transakcja nie powiodła się... Cofanie zmian\n"
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr "Nie można uporządkować transakcji automatycznego cofania zmian!\n"
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr "Nie można otrzymać zainstalowanego elementu instancji bazy danych!\n"
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-"Nie można otrzymać nagłówka dla transakcji automatycznego cofania zmian!\n"
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr "\tDodano z zainstalowanego elementu %s.\n"
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-"Nie można otrzymać ponownie spakowanego nagłówka dla transakcji "
-"automatycznego cofania zmian!\n"
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr "Nie można dodać usuniętego elementu do automatycznego cofania zmian.\n"
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr "Odczytanie ponownie spakowanego pakietu nie powiodło się!\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr "Dodanie nie powiodło się. Nie można odczytać nagłówka pakietu.\n"
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr "Dodanie nie powiodło się w rpmpsmStage().\n"
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr "Dodanie nie powiodło się. Nie można otrzymać listy plików.\n"
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr "Usuwanie nie powiodło się w rpmpsmStage().\n"
-
#: lib/verify.c:274
#, c-format
msgid "missing %c %s"
@@ -3227,143 +3117,143 @@ msgstr ""
msgid "verify database files"
msgstr "sprawdź pliki bazy danych"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: nierozpoznana nazwa znacznika: \"%s\" zignorowana\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr "dbiOpen: dbapi %d nie jest dostępne\n"
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "nie można otworzyć indeksu %s używając bazy danych%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "nie można otworzyć indeksu %s\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "ścieżka bazy danych nie została ustawiona\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "błąd(%d) podczas otrzymywania rekordów \"%s\" z indeksu %s\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: pomijanie"
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "błąd(%d) podczas zapisywania rekordu #%d do %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec nie powiodło się: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp nie powiodło się: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: pomijanie"
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: uszkodzony nagłówek #%u został odtworzony - pomijanie.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: nie można odczytać nagłówka pod 0x%x\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "błąd(%d) podczas ustawiania rekordu nagłówka #%d do usunięcia %s\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "błąd(%d) podczas ustawiania rekordów \"%s\" z indeksu %s\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "błąd(%d) podczas zapisywania rekordu \"%s\" do %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "błąd(%d) usuwania rekordu \"%s\" z %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "błąd(%d) podczas przydzielania nowej instancji pakietu\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr "rpmdbAdd: pomijanie"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "błąd(%d) podczas zapisywania rekordu %s do %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "ścieżka bazy danych nie została ustawiona"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "tymczasowa baza danych %s już istnieje\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "utworzenie katalogu %s nie powiodło się: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "nagłówek #%u w bazie danych jest błędny - pomijanie.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "nie można dodać rekordu będącego oryginalnie przy %u\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"przebudowanie bazy danych nie powiodło się: oryginalna baza danych pozostała "
"na miejscu\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "zamiana starej bazy danych na nową nie powiodła się!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "aby odzyskać należy zastąpić pliki w %s plikami z %s"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "usunięcie katalogu %s nie powiodło się: %s\n"
@@ -3605,3 +3495,86 @@ msgstr "%s: operacja w pamięci podręcznej nie powiodła się: ec %d.\n"
#, c-format
msgid "%s: read manifest failed: %s\n"
msgstr "%s: odczytanie manifestu nie powiodło się: %s\n"
+
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr "cofnięcie zmian przyjmuje argument w postaci znacznika czasu/daty"
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "niesformowany argument znacznika czasu/daty dla cofnięcia zmian"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr "zapisz usuwane pliki z pakietu przenosząc do podkatalogu"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "zapisz usuwane pliki z pakietu poprzez ponowne pakowanie"
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr "odinstaluj nowe, zainstaluj z powrotem stare pakiety aż do <daty>"
+
+#~ msgid "<date>"
+#~ msgstr "<data>"
+
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Nie można ponownie wczytać nagłówka podpisu\n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "Ponowne pakowanie..."
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr "Ponowne pakowanie usuniętych plików..."
+
+#~ msgid "Upgrading..."
+#~ msgstr "Aktualizowanie..."
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "Aktualizowanie pakietów..."
+
+#~ msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
+#~ msgstr "Cofnij pakiety (+%d/-%d) do %-24.24s (0x%08x):\n"
+
+#~ msgid "Cleaning up repackaged packages:\n"
+#~ msgstr "Czyszczenie ponownie spakowanych pakietów:\n"
+
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "\tUsuwanie %s\n"
+
+#~ msgid "Transaction failed...rolling back\n"
+#~ msgstr "Transakcja nie powiodła się... Cofanie zmian\n"
+
+#~ msgid "Could not order auto-rollback transaction!\n"
+#~ msgstr "Nie można uporządkować transakcji automatycznego cofania zmian!\n"
+
+#~ msgid "Could not get install element database instance!\n"
+#~ msgstr ""
+#~ "Nie można otrzymać zainstalowanego elementu instancji bazy danych!\n"
+
+#~ msgid "Could not get header for auto-rollback transaction!\n"
+#~ msgstr ""
+#~ "Nie można otrzymać nagłówka dla transakcji automatycznego cofania zmian!\n"
+
+#~ msgid "\tAdded from install element %s.\n"
+#~ msgstr "\tDodano z zainstalowanego elementu %s.\n"
+
+#~ msgid "Could not get repackaged header for auto-rollback transaction!\n"
+#~ msgstr ""
+#~ "Nie można otrzymać ponownie spakowanego nagłówka dla transakcji "
+#~ "automatycznego cofania zmian!\n"
+
+#~ msgid "Could not add erase element to auto-rollback transaction.\n"
+#~ msgstr ""
+#~ "Nie można dodać usuniętego elementu do automatycznego cofania zmian.\n"
+
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "Odczytanie ponownie spakowanego pakietu nie powiodło się!\n"
+
+#~ msgid "Add failed. Could not read package header.\n"
+#~ msgstr "Dodanie nie powiodło się. Nie można odczytać nagłówka pakietu.\n"
+
+#~ msgid "Add failed in rpmpsmStage().\n"
+#~ msgstr "Dodanie nie powiodło się w rpmpsmStage().\n"
+
+#~ msgid "Add failed. Could not get file list.\n"
+#~ msgstr "Dodanie nie powiodło się. Nie można otrzymać listy plików.\n"
+
+#~ msgid "Erase failed failed in rpmpsmStage().\n"
+#~ msgstr "Usuwanie nie powiodło się w rpmpsmStage().\n"
diff --git a/po/pt.po b/po/pt.po
index 96d9effa5..bb4b172ef 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\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"
@@ -80,169 +80,169 @@ msgstr "erro ao ler o cabeçalho do pacote\n"
msgid "cannot re-open payload: %s\n"
msgstr "não consigo aceder de novo ao conteúdo: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Opções de pesquisa (com o -q ou o --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Opções de verificação (com o -V ou o --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
#, fuzzy
msgid "Source options (with --query or --verify):"
msgstr "Opções de verificação (com o -V ou o --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Opções de assinatura:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Opções da base de dados:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Opções de criação com [ <fich spec> | <fich tar> | <pacote fonte> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Opções de Instalação/Actualização/Remoção:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
#, fuzzy
msgid "Common options for all rpm modes and executables:"
msgstr "Opções comuns para todos os modos do rpm:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versão %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, fuzzy, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr ""
"Este programa pode ser distribuído livremente sob os termos da GPL da GNU"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Erro interno no processamento de argumentos (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "só pode ser especificado um 'major mode'"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "só pode ser realizado um tipo de pesquisa/verificação de cada vez"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "opções de pesquisa inesperadas"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "formato de pesquisa inesperado"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "origem de pesquisa inesperada"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"só a instalação, a actualização, o rmsource e o rmpspec podem ser forçados"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr ""
"os ficheiros só podem ser mudados de sítio durante a instalação do pacote"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"o --relocate e o --excludepath só podem ser usados ao instalar pacotes novos"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "o --prefix só pode ser usado ao instalar pacotes novos"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "os argumentos do --prefix têm de começar por /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "o --hash (-h) só pode ser indicado durante a instalação do pacote"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "o --percent só pode ser indicado durante a instalação do pacote"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "o --replacepkgs só pode ser indicado durante a instalação do pacote"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "o --excludedocs só pode ser indicado durante a instalação do pacote"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "o --includedocs só pode ser indicado durante a instalação do pacote"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "só uma das opções --excludedocs e --includedocs pode ser usada"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "o --ignorearch só pode ser indicado durante a instalação do pacote"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "o --ignoreos só pode ser indicado durante a instalação do pacote"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "o --ignoresize só pode ser indicado durante a instalação do pacote"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "o --allmatches só pode ser indicado ao apagar o pacote"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "o --allfiles só pode ser indicado durante a instalação do pacote"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"o --justdb só pode ser indicado durante a instalação ou a remoção do pacote"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -250,7 +250,7 @@ msgstr ""
"a desactivação de 'scripts' só pode ser indicado durante a instalação ou a "
"remoção de pacotes"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -258,7 +258,7 @@ msgstr ""
"a desactivação dos 'triggers' só pode ser usado durante a instalação ou "
"remoção de pacotes"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -266,7 +266,7 @@ msgstr ""
"o --nodeps só pode ser indicado durante a criação, reconstrução, "
"recompilação, instalação, remoção ou verificação do pacote"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -274,7 +274,7 @@ msgstr ""
"o --test só pode ser indicado durante a instalação, remoção ou criação do "
"pacote"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -282,82 +282,82 @@ msgstr ""
"o --root (-r) só pode ser indicado durante a instalação, remoção ou pesquisa "
"do pacote ou na reconstrução da base de dados"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "os argumentos do --root (-r) têm de começar por /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "não existem ficheiros a assinar\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "não consigo aceder ao ficheiro %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp não encontrado: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Indique a palavra-chave: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "A verificação da palavra-chave falhou\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "A palavra-chave está correcta.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Spec %%_signature inválido no ficheiro de macros.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "o --sign só pode ser usado na criação do pacote"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "o exec falhou\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "não foram indicados pacotes para a reconstrução"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "não foram indicados ficheiros spec para a criação"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "não foram indicados ficheiros tar para a criação"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "não foram indicados pacotes para apagar"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "não foram indicados pacotes para instalar"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "não foram indicados argumentos para a pesquisa"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "não foram indicados argumentos para a verificação"
-#: rpmqv.c:802
+#: rpmqv.c:792
#, fuzzy
msgid "no arguments given"
msgstr "não foram indicados argumentos para a pesquisa"
@@ -575,7 +575,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:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Ficheiro não encontrado pelo glob: %s\n"
@@ -744,7 +744,7 @@ msgstr "Não consegui reler o cabeçalho do assinatura.\n"
msgid "Could not open %s: %s\n"
msgstr "Não consigo aceder ao %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Não consegui gravar o pacote: %s\n"
@@ -1276,19 +1276,19 @@ msgstr "não verificar as dependências de compilação"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr "gerar um cabeçalho do pacote compatível com os pacotes do rpm[23]"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "não verificar as dependências do pacote"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
#, fuzzy
msgid "don't verify database header(s) when retrieved"
msgstr "não verifica a arquitectura do pacote"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
#, fuzzy
msgid "don't verify package signature(s)"
@@ -1331,7 +1331,7 @@ msgstr "gerar os cabeçalhos compatíveis com o formato do rpm[23]"
msgid "Couldn't exec %s: %s\n"
msgstr "Não consegui executar o %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Não consegui executar à parte o %s: %s\n"
@@ -1838,42 +1838,34 @@ msgstr "depurar a gestão da 'cache' de URLs"
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "as directorias de exclusão têm de começar por /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "os novos locais têm de começar por /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "os novos locais têm de conter um ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "os novos locais têm de ter um / a seguir ao ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr "'rollback' recebe como argumento uma hora/data"
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr "argumento hora/data inválido para 'rollback'"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
#, fuzzy
msgid "add suggested packages to transaction"
msgstr "pesquisar/verificar o(s) pacote(s) de transacção de instalação"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"instala todos os ficheiros, mesmo as configurações que de outro modo seriam "
"ignoradas"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1881,162 +1873,157 @@ msgstr ""
"remove todos os pacotes que correspondam a <pacote> (normalmente aparece um "
"erro se o <pacote> especifica vários pacotes)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "não executar nenhuns scripts do pacote"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr "muda os ficheiros de sítio num pacote de localização fixa"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-"gravar os ficheiros do pacote apagado mudando o nome para sub-directoria"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "apaga (desinstala) o pacote"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<pacote>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr "listar todos os ficheiros de configuração"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "não instala a documentação"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "ignorar os ficheiros com a componente inicial <dir> "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<caminho>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr "muda os ficheiros de sítio num pacote de localização fixa"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "abreviatura para --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "actualizar o pacote(s) se já estiver instalado"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<pacote>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "mostra cardinais enquanto o pacote instala (conveniente com o -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "não verifica a arquitectura do pacote"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "não verifica o sistema operativo do pacote"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "não verifica o espaço em disco antes de instalar"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "instala a documentação"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
#, fuzzy
msgid "install package(s)"
msgstr "instala o pacote"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "actualiza a base de dados, mas não altera o sistema de ficheiros"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "não verifica as dependências do pacote"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "não verificar o MD5 dos ficheiros"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
#, fuzzy
msgid "don't install file security contexts"
msgstr "listar todos os ficheiros de configuração"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"não reorganiza a instalação dos pacotes para satisfazer as dependências"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "não executar o script %%pre (se existir)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "não executar o script %%post (se existir)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "não executar o script %%preun (se existir)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "não executar o script %%postun (se existir)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "não executar nenhum dos scripts activados por este pacote"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerprein"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerin"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerun"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerpostun"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2044,51 +2031,39 @@ msgstr ""
"actualiza para um versão antiga do pacote (o --force faz isto "
"automaticamente)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "mostra percentagens enquanto o pacote instala"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "muda o pacote para <dir>, se for possível"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "muda os ficheiros de <velho> para <novo>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<velho>=<novo>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "gravar ficheiros apagados reempacotando-os"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "reinstalar se o pacote já estiver presente"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr "desinstalador novo, reinstalar velho, pacote(s) voltar à <data>"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<data>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
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:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "actualizar pacote(s)"
@@ -2318,57 +2293,52 @@ msgstr "assinar um pacote (retira a assinatura actual)"
msgid "generate signature"
msgstr "gerar a assinatura"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr ""
"esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "o pacote de código-fonte não contem um ficheiro .spec\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr ""
"a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr ""
"a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, fuzzy, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n"
-#: lib/psm.c:1581
-#, fuzzy
-msgid "Unable to reload signature header\n"
-msgstr "Não consegui reler o cabeçalho do assinatura.\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "a abertura do pacote falhou%s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " no ficheiro "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s falhou no ficheiro %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s falhou: %s\n"
@@ -2470,7 +2440,7 @@ msgstr "número de pacote inválido: %s\n"
msgid "record %lu could not be read\n"
msgstr "o registo %u não pôde ser lido\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "o pacote %s não está instalado\n"
@@ -2622,8 +2592,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "- não suportado em cadeias de caracteres\n"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2634,108 +2604,75 @@ msgstr "o acesso ao %s falhou: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "opção desconhecida"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "dependências falhadas:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "A preparar..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "A preparar os pacotes para a instalação..."
-#: lib/rpminstall.c:178
-#, fuzzy
-msgid "Repackaging..."
-msgstr "A preparar..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr ""
-
-#: lib/rpminstall.c:199
-#, fuzzy
-msgid "Upgrading..."
-msgstr "A preparar..."
-
-#: lib/rpminstall.c:201
-#, fuzzy
-msgid "Upgrading packages..."
-msgstr "actualizar pacote(s)"
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "A obter o %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "a ignorar o %s - a transferência falhou - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "o %s não pode ser instalado\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, 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:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "erro ao ler do ficheiros %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, 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:577
+#: lib/rpminstall.c:539
#, fuzzy, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "nenhum pacote coincide com %s: %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "não consigo aceder ao ficheiro %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "o \"%s\" especifica vários pacotes\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "não consigo aceder ao %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "A instalar o %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr "A obter o %s\n"
-
#: lib/rpmlead.c:100
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
@@ -3093,56 +3030,6 @@ msgstr "'Digest' MD5 estragado: NÃO SUPORTADO\n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Assinatura: tamanho(%d)+pad(%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr "erro ao ler o cabeçalho do pacote\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3293,143 +3180,143 @@ msgstr ""
msgid "verify database files"
msgstr "verificar ficheiros da base de dados"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: nome de opção não reconhecido: \"%s\" ignorado\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "não consigo abrir o índice de %s usando o db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "não consigo abrir o índice do %s\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "não foi definido o dbpath\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "erro(%d) ao guardar o registo %s em %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: O Fseek falhou: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: o acesso falhou: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, fuzzy, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: não consigo ler o cabeçalho em 0x%x\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "erro(%d) ao guardar o registo %s em %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "erro(%d) ao remover o registo %s do %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "erro(%d) ao criar uma nova instância do pacote\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
#, fuzzy
msgid "rpmdbAdd: skipping"
msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "erro(%d) ao guardar o registo %s em %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "não foi definido o dbpath"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "A base de dados temporária %s já existe\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "falhou a remoção da directoria %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, fuzzy, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "o número do registo %u na base de dados está errado -- a ignorar.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "não consigo adicionar o registo originalmente em %u\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"falhou a reconstrução da base de dados: a base de dados original mantém-se\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "falhou a substituição da base de dados antiga pela nova!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "falhou a remoção da directoria %s: %s\n"
@@ -3674,6 +3561,49 @@ msgstr "%s: o acesso falhou: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: a leitura do manifesto falhou: %s\n"
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr "'rollback' recebe como argumento uma hora/data"
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "argumento hora/data inválido para 'rollback'"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr ""
+#~ "gravar os ficheiros do pacote apagado mudando o nome para sub-directoria"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "gravar ficheiros apagados reempacotando-os"
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr "desinstalador novo, reinstalar velho, pacote(s) voltar à <data>"
+
+#~ msgid "<date>"
+#~ msgstr "<data>"
+
+#, fuzzy
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Não consegui reler o cabeçalho do assinatura.\n"
+
+#, fuzzy
+#~ msgid "Repackaging..."
+#~ msgstr "A preparar..."
+
+#, fuzzy
+#~ msgid "Upgrading..."
+#~ msgstr "A preparar..."
+
+#, fuzzy
+#~ msgid "Upgrading packages..."
+#~ msgstr "actualizar pacote(s)"
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "A obter o %s\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "erro ao ler o cabeçalho do pacote\n"
+
#~ msgid "========== recording tsort relations\n"
#~ msgstr "=========== a guardar as relações do tsort\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 97676b5c4..1c1b9a853 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2007-08-03 15:46-0300\n"
"Last-Translator: Igor Pires Soares <igor@projetofedora.org>\n"
"Language-Team: Brazilian Portuguese <fedora-trans-pt_br@redhat.com>\n"
@@ -90,44 +90,44 @@ msgstr "erro ao ler o cabeçalho do pacote\n"
msgid "cannot re-open payload: %s\n"
msgstr "Não foi possível reabrir a carga útil: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Opções de consulta (com -q ou --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Opções de verificação (com -V ou --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr "Opções de fonte (com --query ou --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr "Opções de caminhamento pela árvore de arquivos (com --ftswalk):"
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Opções de assinatura:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Opções de banco de dados:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "opções de construção com [ <specfile> | <tarball> | <pacote fonte> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Opções de Instalação/Atualização/Remoção:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "Opções comuns para todos os executáveis e modos rpm:"
# , c-format
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
@@ -140,138 +140,138 @@ msgstr "%s: %s\n"
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versão %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr ""
"Este programa pode ser livremente redistribuído sob os termos da GNU GPL\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Erro interno no processamento do argumento (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "somente um modo principal pode ser especificado"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "somente um tipo de consulta/verificação pode ser feita por vez"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "sinalizador de consulta não esperado"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "formato de consulta não esperado"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "fonte de pesquisa não esperada"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"somente a instalação, atualização, rmsource e rmspec podem ser forçados"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr ""
"os arquivos somente podem ser realocados durante a instalação de pacotes"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr "não é possível usar --prefix com --relocate ou --excludepath"
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate e --excludepath somente podem ser usados na instalação de novos "
"pacotes"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix somente pode ser usado na instalação de novos pacotes"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "argumentos para --prefix devem começar com uma /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
"--hash (-h) somente pode ser especificado durante instalação de pacotes"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr ""
"--percent somente pode ser especificado durante a instalação de pacotes"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs somente pode ser especificado durante a instalação de pacotes"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr ""
"--excludedocs somente pode ser especificado durante instalação de pacotes"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr ""
"--includedocs somente pode ser especificado durante instalação de pacotes"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr ""
"--ignorearch somente pode ser especificado durante a instalação de pacotes"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr ""
"--ignoreos somente pode ser especificado durante a instalação de pacotes"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr ""
"--ignoresize somente pode ser especificado durante a instalação de pacotes"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--allmatches somente pode ser especificado durante a remoção de pacotes"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr ""
"--allfiles somente pode ser especificado durante a instalação de pacotes"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb somente pode ser especificado durante a instalação ou remoção de "
"pacotes"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -279,7 +279,7 @@ msgstr ""
"opções de desativação de scripts somente podem ser especificadas durante a "
"instalação ou remoção de pacotes"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -287,7 +287,7 @@ msgstr ""
"opções de desativação de disparador somente podem ser especificadas durante "
"a instalação ou remoção de pacotes"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -295,7 +295,7 @@ msgstr ""
"--nodeps somente pode ser especificado durante a construção, reconstrução, "
"recompilação, instalação, remoção ou verificação de pacotes"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -303,7 +303,7 @@ msgstr ""
"--test somente pode ser especificado durante a instalação, remoção e "
"construção de pacotes"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -311,82 +311,82 @@ msgstr ""
"--root (-r) somente pode ser especificado durante a instalação, remoção, "
"consulta e reconstrução de bancos de dados"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "os argumentos para --root (-r) devem começar com uma /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "nenhum arquivo para assinar\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "não foi possível acessar o arquivo %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp não encontrada: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Digite a senha: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "A verificação da senha falhou\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Senha ok.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Especificação %%_signature inválida no arquivo macro.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign somente pode ser usado durante a construção de pacotes"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "a execução falhou\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "nenhum pacote foi passado para reconstrução"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "nenhum arquivo spec foi passado para construção"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "não foram passados arquivos tar para construção"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "nenhum pacote foi passado para remoção"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "nenhum pacote foi passado para instalação"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "nenhum argumento foi passado para consulta"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "nenhum argumento foi passado para verificação"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "nenhum argumento foi passado"
@@ -623,7 +623,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:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "O arquivo não foi encontrado pelo glob: %s\n"
@@ -812,7 +812,7 @@ msgid "Could not open %s: %s\n"
msgstr "Não foi possível abrir %s: %s\n"
# , c-format
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Não foi possível gravar o pacote: %s\n"
@@ -1403,17 +1403,17 @@ msgstr ""
"gerar cabeçalhos de pacotes compatíveis com o empacotamento do rpm[23] "
"(legado)"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "não verificar digest(s) dos pacotes"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "não verificar cabeçalho(s) do banco de dados ao recuperá-lo(s)"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "não verificar a(s) assinatura(s) do pacote"
@@ -1457,7 +1457,7 @@ msgid "Couldn't exec %s: %s\n"
msgstr "Não foi possível executar %s: %s\n"
# , c-format
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Não foi possível bifurcar %s: %s\n"
@@ -1973,40 +1973,32 @@ msgstr "depurar tratamento de cache URL"
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: tabela de opções mal configurada (%d)\n"
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "caminhos de exclusão devem começar com uma /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "realocações devem começar com uma /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "realocações devem conter um ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "realocações devem conter uma / após o ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr "recuos levam um argumento de identificação de hora/data"
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr "argumento de identificação de hora/data do recuo mal formado"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr "adicionar pacotes sugeridos à transação"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"instala todos os arquivos, até configurações que poderiam ser ignoradas"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -2014,155 +2006,151 @@ msgstr ""
"remover todos os pacotes iguais ao <pacote> (normalmente um erro é gerado se "
"o <pacote> especificou múltiplos pacotes)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "não executar scriptlet(s) do pacote"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr "realocar arquivos em pacotes não realocáveis"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr "exibir loops de dependências como aviso"
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr "salvar arquivos de pacotes removidos renomeando em um subdiretório"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "remover (desinstalar) pacote"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<pacote>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "não instalar arquivos de configuração"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "não instalar documentação"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "ignorar arquivos com componentes principais <caminho> "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<caminho>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr "detectar conflitos de arquivo entre os pacotes"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "atalho para --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "atualizar pacote(s) se já estiver(em) instalado(s)"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<arquivo_do_pacote>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "exibir cerquilhas a medida que o pacote instala (bom com -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "não verificar a arquitetura do pacote"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "não verificar o sistema operacional do pacote"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "não verificar o espaço em disco antes de instalar"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "instalar a documentação"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "instalar pacote(s)"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "atualizar o banco de dados, mas não modificar o sistema de arquivos"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "não verificar as dependências do pacote"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "não verificar o digest MD5 dos arquivos"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr "não instalar contextos de segurança dos arquivos"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr "não reordenar a instalação dos pacotes para satisfazer as dependências"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr "não sugerir a resolução de dependências não encontradas"
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "não executar o scriptlet %%pre (se existir)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "não executar o scriptlet %%post (se existir)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "não executar o scriptlet %%preun (se existir)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "não executar o scriptlet %%postun (se existir)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "não executar nenhum scriptlet disparado por este pacote"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "não executar nenhum scriptlet %%triggerprein"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "não executar nenhum scriptlet %%triggerin"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "não executar nenhum scriptlet %%triggerun"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "não executar nenhum scriptlet %%triggerpostun"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2170,52 +2158,39 @@ msgstr ""
"atualizar para uma versão mais antiga do pacote (--force em atualizações faz "
"isso automaticamente)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "exibir porcentagens na medida em que o pacote vai sendo instalado"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "realocar o pacote para <dir>, se for realocável"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "realocar arquivos do caminho <antigo> para o <novo>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<antigo>=<novo>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "salvar arquivos de pacotes removidos reempacotando-os"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr "ignorar conflitos de arquivos entre pacotes"
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "reinstalar se o pacote já estiver presente"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-"desinstalar novo(s) e reinstalar pacote(s) antigo(s), retornando a <data>"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<data>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
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:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "atualizar pacote(s)"
@@ -2432,55 +2407,50 @@ msgstr "assinar pacote(s) (idêntico ao --addsign)"
msgid "generate signature"
msgstr "gerar assinatura"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "um pacote fonte era esperado, mas um binário foi encontrado\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "o pacote fonte não contém um arquivo .spec\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s(%s-%s-%s.%s) o scriptlet falhou, waitpid(%d) rc %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s(%s-%s-%s.%s) o scriptlet falhou, sinal %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "%s(%s-%s-%s.%s) o scriptlet falhou, status de saída %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: %s o scriptlet falhou (%d), ignorando %s\n"
-# , c-format
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "Não foi possível recarregar o cabeçalho de assinatura\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "a descompactação do arquivo falhou %s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " no arquivo "
# , c-format
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s falhou no arquivo %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s falhou: %s\n"
@@ -2582,7 +2552,7 @@ msgstr "número de pacote inválido: %s\n"
msgid "record %lu could not be read\n"
msgstr "o registro %u não pôde ser lido\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "o pacote %s não está instalado\n"
@@ -2749,8 +2719,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "suporte interno para scripts lua."
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2762,35 +2732,19 @@ msgstr "falha ao abrir %s: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "etiqueta desconhecida: \"%s\"\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Dependências não satisfeitas:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "Preparando..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Preparando os pacotes para instalação..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "Reempacotando..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr "Reempacotando arquivos apagados..."
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "Atualizando..."
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "Atualizando pacotes..."
-
# "Project-Id-Version: rpm-2.5.3\n"
# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
@@ -2799,85 +2753,63 @@ msgstr "Atualizando pacotes..."
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Obtendo %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "ignorando %s - a transferência falhou - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s não pode ser instalado\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, c-format
msgid "package %s is not relocatable\n"
msgstr "o pacote %s não é realocável\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "erro ao ler o arquivo %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, 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:577
+#: lib/rpminstall.c:539
#, c-format
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"
# , c-format
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "Não foi possível abrir o arquivo %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" especifica múltiplos pacotes\n"
# , c-format
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "Não foi possível abrir %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Instalando %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr "Recuar pacotes (+%d/-%d) para %-24.24s (0x%08x):\n"
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr "Limpando pacotes reempacotados:\n"
-
-# "Project-Id-Version: rpm-2.5.3\n"
-# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
-# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-# "Language-Team: Portuguese <pt@li.org>\n"
-# "MIME-Version: 1.0\n"
-# "Content-Type: text/plain; charset=ISO-8859-1\n"
-# "Content-Transfer-Encoding: 8-bit\n"
-# , c-format
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr "\tRemovendo %s:\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3237,61 +3169,6 @@ msgstr "Digest MD5 defeituoso: NÃO SUPORTADO\n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Assinatura: DESCONHECIDA (%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr "A transação falhou... recuando\n"
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr "Não foi possível ordenar a transação de auto-recuo!\n"
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-"Não foi possível obter a instância do banco de dados do elemento de "
-"instalação!\n"
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr "Não foi possível obter o cabeçalho da transação de auto-recuo!\n"
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr "\tAdicionado a partir do elemento de instalação %s.\n"
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-"Não foi possível obter o cabeçalho reempacotado para a transação de auto-"
-"recuo!\n"
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-"Não foi possível adicionar um elemento de remoção à transação de auto-"
-"recuo.\n"
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr "Falha ao ler o pacote reempacotado!\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr "A adição falhou. Não foi possível ler o cabeçalho do pacote.\n"
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr "A adição falhou no rpmpsmStage().\n"
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr "A adição falhou. Não foi possível obter a lista de arquivos.\n"
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr "A remoção falhou no rpmpsmStage().\n"
-
# , c-format
#: lib/verify.c:274
#, c-format
@@ -3443,156 +3320,156 @@ msgstr ""
msgid "verify database files"
msgstr "verificar arquivos do banco de dados"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: nome da etiqueta não reconhecido: \"%s\" ignorado\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "não foi possível abrir o índice %s usando o db%d - %s (%d)\n"
# , c-format
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "não foi possível abrir o índice %s\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "nenhum dbpath foi definido\n"
# , c-format
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "erro (%d) ao obter os registros \"%s\" a partir do índice %s\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: ignorando"
# , c-format
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "erro (%d) ao armazenar o registro #%d em %s\n"
# , c-format
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek falhou: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: falha ao abrir: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: ignorando"
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: cabeçalho danificado #%u recuperado -- ignorando.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: não foi possível ler o cabeçalho em 0x%x\n"
# , c-format
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "erro (%d) ao definir o registro do cabeçalho #%d para remoção de %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "erro (%d) ao definir registros \"%s\" a partir do índice %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "erro (%d) ao armazenar o registro \"%s\" em %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "erro (%d) ao remover o registro \"%s\" a partir de %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "erro (%d) ao alocar nova instância do pacote\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr "rpmdbAdd: ignorando"
# , c-format
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "erro (%d) ao armazenar o registro %s em %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "nenhum dbpath foi definido"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "o banco de dados temporário %s já existe\n"
# , c-format
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "falha ao remover o diretório %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "o cabeçalho #%u do banco de dados é inválido -- ignorando.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "não é possível adicionar o registro originalmente em %u\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"falha ao reconstruir o banco de dados: o banco de dados original permanece "
"no lugar\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "falha ao substituir o banco de dados velho pela novo!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "substituir arquivos em %s com arquivos de %s para recuperação"
# , c-format
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "falha ao remover o diretório %s: %s\n"
@@ -3847,6 +3724,100 @@ msgstr "%s: falha na operação do cache: ec %d.\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: falha na leitura do manifesto: %s\n"
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr "recuos levam um argumento de identificação de hora/data"
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "argumento de identificação de hora/data do recuo mal formado"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr "salvar arquivos de pacotes removidos renomeando em um subdiretório"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "salvar arquivos de pacotes removidos reempacotando-os"
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr ""
+#~ "desinstalar novo(s) e reinstalar pacote(s) antigo(s), retornando a <data>"
+
+#~ msgid "<date>"
+#~ msgstr "<data>"
+
+# , c-format
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Não foi possível recarregar o cabeçalho de assinatura\n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "Reempacotando..."
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr "Reempacotando arquivos apagados..."
+
+#~ msgid "Upgrading..."
+#~ msgstr "Atualizando..."
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "Atualizando pacotes..."
+
+#~ msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
+#~ msgstr "Recuar pacotes (+%d/-%d) para %-24.24s (0x%08x):\n"
+
+#~ msgid "Cleaning up repackaged packages:\n"
+#~ msgstr "Limpando pacotes reempacotados:\n"
+
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "\tRemovendo %s:\n"
+
+#~ msgid "Transaction failed...rolling back\n"
+#~ msgstr "A transação falhou... recuando\n"
+
+#~ msgid "Could not order auto-rollback transaction!\n"
+#~ msgstr "Não foi possível ordenar a transação de auto-recuo!\n"
+
+#~ msgid "Could not get install element database instance!\n"
+#~ msgstr ""
+#~ "Não foi possível obter a instância do banco de dados do elemento de "
+#~ "instalação!\n"
+
+#~ msgid "Could not get header for auto-rollback transaction!\n"
+#~ msgstr "Não foi possível obter o cabeçalho da transação de auto-recuo!\n"
+
+#~ msgid "\tAdded from install element %s.\n"
+#~ msgstr "\tAdicionado a partir do elemento de instalação %s.\n"
+
+#~ msgid "Could not get repackaged header for auto-rollback transaction!\n"
+#~ msgstr ""
+#~ "Não foi possível obter o cabeçalho reempacotado para a transação de auto-"
+#~ "recuo!\n"
+
+#~ msgid "Could not add erase element to auto-rollback transaction.\n"
+#~ msgstr ""
+#~ "Não foi possível adicionar um elemento de remoção à transação de auto-"
+#~ "recuo.\n"
+
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "Falha ao ler o pacote reempacotado!\n"
+
+#~ msgid "Add failed. Could not read package header.\n"
+#~ msgstr "A adição falhou. Não foi possível ler o cabeçalho do pacote.\n"
+
+#~ msgid "Add failed in rpmpsmStage().\n"
+#~ msgstr "A adição falhou no rpmpsmStage().\n"
+
+#~ msgid "Add failed. Could not get file list.\n"
+#~ msgstr "A adição falhou. Não foi possível obter a lista de arquivos.\n"
+
+#~ msgid "Erase failed failed in rpmpsmStage().\n"
+#~ msgstr "A remoção falhou no rpmpsmStage().\n"
+
#, fuzzy
#~ msgid "\twaitpid(%d) rc %d status %x\n"
#~ msgstr "%s: waitpid(%d) rc %d status %x segs %u.%03u\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index 1808d4bb7..4693a2621 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\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"
@@ -85,267 +85,267 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr ""
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr ""
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr ""
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr ""
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr ""
@@ -559,7 +559,7 @@ msgstr ""
msgid "Glob not permitted: %s\n"
msgstr ""
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -726,7 +726,7 @@ msgstr ""
msgid "Could not open %s: %s\n"
msgstr ""
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr ""
@@ -1249,17 +1249,17 @@ msgstr ""
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr ""
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr ""
@@ -1301,7 +1301,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr ""
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr ""
@@ -1791,243 +1791,219 @@ msgstr ""
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr ""
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr ""
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr ""
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr ""
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr ""
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr ""
@@ -2242,53 +2218,49 @@ msgstr ""
msgid "generate signature"
msgstr ""
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:864
+#: lib/psm.c:854
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/psm.c:873
+#: lib/psm.c:863
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr ""
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr ""
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr ""
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr ""
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr ""
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr ""
@@ -2389,7 +2361,7 @@ msgstr ""
msgid "record %lu could not be read\n"
msgstr ""
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2535,8 +2507,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr ""
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2547,104 +2519,74 @@ msgstr ""
msgid "unknown tag: \"%s\"\n"
msgstr ""
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr ""
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr ""
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr ""
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr ""
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr ""
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -2993,55 +2935,6 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr ""
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, c-format
msgid "missing %c %s"
@@ -3189,141 +3082,141 @@ msgstr ""
msgid "verify database files"
msgstr ""
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 888cad63d..7a6cd48df 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2002-08-27 13:36-0400\n"
"Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -81,170 +81,170 @@ msgstr " \n"
msgid "cannot re-open payload: %s\n"
msgstr " payload: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr " ( -q --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr " ( -V --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
#, fuzzy
msgid "Source options (with --query or --verify):"
msgstr " ( -V --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr " :"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr " "
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
" [ < > | < > | < > ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr " //:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr " rpm:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr " GNU GPL\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr " (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr " "
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr " "
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr " "
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr " "
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr " "
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
" , , "
" "
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr " "
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
" --relocate --excludepath "
" "
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr " --prefix "
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr " --prefix /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) "
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent "
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs "
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs "
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs "
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
" --excludedocs --"
"includedocs"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch "
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos "
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize "
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches "
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles "
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb "
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -252,7 +252,7 @@ msgstr ""
" "
" "
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -260,7 +260,7 @@ msgstr ""
" "
" ()"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -268,14 +268,14 @@ msgstr ""
"--nodeps , , "
""
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test , "
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -283,82 +283,82 @@ msgstr ""
"--root (-r) , , "
" "
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr " --root (-r) /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr " \n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr " %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp : "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr " : "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr " \n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr " .\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr " %%_signature .\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign "
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr " \n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr " "
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr " "
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr " tar- "
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr " "
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr " "
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr " "
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr " "
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr " "
@@ -575,7 +575,7 @@ msgstr " \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Glob : %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr " : %s\n"
@@ -744,7 +744,7 @@ msgstr " .\n"
msgid "Could not open %s: %s\n"
msgstr " %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr " : %s\n"
@@ -1280,17 +1280,17 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
" () , () rpm[23]"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr " ()"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr " , "
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr " () ()"
@@ -1332,7 +1332,7 @@ msgstr " , () rpm[23]"
msgid "Couldn't exec %s: %s\n"
msgstr " %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr " %s: %s\n"
@@ -1829,41 +1829,33 @@ msgstr " URL "
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: (%d)\n"
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr " /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr " /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr " ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr " / ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr " "
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr " "
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr " "
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
" , , "
""
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1871,159 +1863,155 @@ msgstr ""
" , <> (, <> "
" , )"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr " ()"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr " "
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr " "
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr " () "
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr " "
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr " "
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr " <>"
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr " "
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr " --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr " () "
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "< >+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr " \"#\" ( -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr " "
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr " "
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr " "
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr " "
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr " ()"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr " , "
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr " "
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr " MD5"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
#, fuzzy
msgid "don't install file security contexts"
msgstr " "
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr " "
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr " () ()"
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr " %%pre ( )"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr " %%post ( )"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr " %%preun ( )"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr " %%postun ( )"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr " -, "
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr " %%triggerprein "
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr " %%triggerin "
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr " %%triggerun "
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr " %%triggerpostun "
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2031,53 +2019,39 @@ msgstr ""
" (--force "
")"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr " "
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr " <>, "
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr " <old> <new>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr " "
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr ", "
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-" () (), () (), "
-" "
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr " , , "
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr " ()"
@@ -2298,53 +2272,49 @@ msgstr " ( --addsign)"
msgid "generate signature"
msgstr " "
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr " \n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr " \n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s(%s-%s-%s) , waitpid(%d) rc %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s(%s-%s-%s) , %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "%s(%s-%s-%s) , %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: %s (%d), %s\n"
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr " \n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr " %s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s : %s\n"
@@ -2445,7 +2415,7 @@ msgstr " : %s\n"
msgid "record %lu could not be read\n"
msgstr " %u\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr " %s \n"
@@ -2597,8 +2567,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "- \n"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2609,104 +2579,74 @@ msgstr " %s: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr " "
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr " :\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr " ..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr " ..."
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "..."
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr " ..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr " %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s - - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s \n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr " %s - \n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr " %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr " %s RPM\n"
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: ( ) rpm : %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr " %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" \n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr " %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr " %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr " (+%d/-%d) %-24.24s (0x%08x):\n"
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr " %s\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3058,56 +2998,6 @@ msgstr ". MD5 : \n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr ": (%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr " \n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3259,145 +3149,145 @@ msgstr ""
msgid "verify database files"
msgstr " "
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: \"%s\" , \n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr " %s db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr " %s\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr " dbpath \n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "(%d) \"%s\" %s\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
#, fuzzy
msgid "miFreeHeader: skipping"
msgstr "rpmdb: "
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr " (%d) #%d %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: : %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
#, fuzzy
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdb: "
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: #%u -- .\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%x\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "(%d) #%d %s\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "(%d) \"%s\" %s\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "(%d) \"%s\" %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "(%d) %s %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "(%d) \n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
#, fuzzy
msgid "rpmdbAdd: skipping"
msgstr "rpmdb: "
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "(%d) %s %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr " dbpath "
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr " %s \n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr " %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr " %u -- .\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr " ( %u)\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
" , \n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr " !\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr " %s %s "
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr " %s: %s\n"
@@ -3641,6 +3531,52 @@ msgstr "%s: : %d.\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: : %s\n"
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr " "
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr " "
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr " "
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr " "
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr ""
+#~ " () (), () (), "
+#~ " "
+
+#~ msgid "<date>"
+#~ msgstr "<>"
+
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr " \n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "..."
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr " ..."
+
+#~ msgid "Upgrading..."
+#~ msgstr "..."
+
+#~ msgid "Upgrading packages..."
+#~ msgstr " ..."
+
+#~ msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
+#~ msgstr " (+%d/-%d) %-24.24s (0x%08x):\n"
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr " %s\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr " \n"
+
#, fuzzy
#~ msgid "\twaitpid(%d) rc %d status %x\n"
#~ msgstr "%s: waitpid(%d) rc %d status %x\n"
diff --git a/po/sk.po b/po/sk.po
index 59f7da7b8..131dcb350 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\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"
@@ -80,182 +80,182 @@ msgstr "chyba pri tan hlaviky balka\n"
msgid "cannot re-open payload: %s\n"
msgstr "nie je mon otvori sbor %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr ""
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
#, fuzzy
msgid "Signature options:"
msgstr "Vekos podpisu: %d\n"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr ""
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr ""
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "sbor %s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzia %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, fuzzy, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "Program me by vone redistribuovan v slade s podmienkami GNU GPL"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Vntorn chyba pri spracovan argumentu (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "me by pouit iba jeden hlavn reim"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "naraz me by vykonan jeden typ otzky alebo overenia"
-#: rpmqv.c:352
+#: rpmqv.c:350
#, fuzzy
msgid "unexpected query flags"
msgstr "neoakvan zdroj pre otzku"
-#: rpmqv.c:355
+#: rpmqv.c:353
#, fuzzy
msgid "unexpected query format"
msgstr "neoakvan zdroj pre otzku"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "neoakvan zdroj pre otzku"
-#: rpmqv.c:401
+#: rpmqv.c:399
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "iba intalcia, aktualizcia a odstrnenie zdrojov mu by vynten"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "sbory mu by presunut iba poas intalcie balka"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate a --excludepath mu by pouit iba poas intalcie novch "
"balkov"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix me by pouit iba poas intalcie novch balkov"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty pre --prefix musia zana znakom /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) me by pouit iba poas intalcie balka"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent me by pouit iba poas intalcie balka"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs me by pouit iba poas intalcie balka"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs me by pouit iba poas intalcie balka"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs me by pouit iba poas intalcie balka"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "me by pouit iba jedna voba z --excludedocs a --includedocs"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch me by pouit iba poas intalcie balka"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos me by pouit iba poas intalcie balka"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize me by pouit iba poas intalcie balka"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches me by pouit iba poas odstrnenia balkov"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles me by pouit iba poas intalcie balka"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb me by pouit iba poas intalcie a odstrnenia balka"
-#: rpmqv.c:469
+#: rpmqv.c:467
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb me by pouit iba poas intalcie a odstrnenia balka"
-#: rpmqv.c:474
+#: rpmqv.c:472
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb me by pouit iba poas intalcie a odstrnenia balka"
-#: rpmqv.c:478
+#: rpmqv.c:476
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -264,7 +264,7 @@ msgstr ""
"--nodeps me by pouit iba poas intalcie, odstrnenia alebo overenia "
"balka"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -272,7 +272,7 @@ msgstr ""
"--test me by pouit iba poas intalcie, odstrnenia alebo zostavenia "
"balka"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -280,83 +280,83 @@ msgstr ""
"--root (-r) me by pouit iba poas intalcie a odstrnenia balka, "
"otzky alebo znovuzostavenia databzy"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty pre --root (-r) musia zana znakom /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "nie je mon pracova so sborom %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp nebolo njden: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Kontrola hesla zlyhala\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Heslo je v poriadku.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Chybn pecifikcia %%_signature v makro-sbore.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign me by pout iba poas zostavenia balka"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "vykonanie zlyhalo\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "neboli zadan iadne balky pre znovuzostavenie"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "neboli zadan iadne spec-sbory pre zostavenie"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "neboli zadan iadne tar-sbory pre zostavenie"
-#: rpmqv.c:718
+#: rpmqv.c:715
#, fuzzy
msgid "no packages given for erase"
msgstr "neboli zadan iadne balky pre intalciu"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "neboli zadan iadne balky pre intalciu"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "neboli zadan iadne argumenty pre otzku"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "neboli zadan iadne argumenty pre overenie"
-#: rpmqv.c:802
+#: rpmqv.c:792
#, fuzzy
msgid "no arguments given"
msgstr "neboli zadan iadne argumenty pre otzku"
@@ -584,7 +584,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:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, fuzzy, c-format
msgid "File not found by glob: %s\n"
msgstr "Sbor nebol njden: %s"
@@ -755,7 +755,7 @@ msgstr "Nie je mon preta ikonu: %s"
msgid "Could not open %s: %s\n"
msgstr "Otvorenie %s zlyhalo\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Nie je mon zapsa balk: %s"
@@ -1293,19 +1293,19 @@ msgstr "neoverova zvislosti balka"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "neoverova zvislosti balka"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
#, fuzzy
msgid "don't verify database header(s) when retrieved"
msgstr "neoverova architektru balka"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
#, fuzzy
msgid "don't verify package signature(s)"
@@ -1352,7 +1352,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Nie je mon spusti %s"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, fuzzy, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Nie je mon vytvori proces %s"
@@ -1858,42 +1858,34 @@ msgstr ""
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "vynechan cesty musia zana znakom /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "presunutia musia zana znakom /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "presunutia musia obsahova znak ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "presunutia musia ma za znakom = znak /"
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
#, fuzzy
msgid "add suggested packages to transaction"
msgstr "opta sa vetkch balkov v skupine"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"intalova vetky sbory vrtane konfiguranch sborov, ktor by inak mohli "
"by vynechan"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1901,167 +1893,163 @@ msgstr ""
"odintalova vetky balky uren <balkom> (inak je chybou, pokia <balk> "
"pecifikuje viac ako jeden balk)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "nevykona iadne skripty pecifikovan balkom"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr "balk %s nie je naintalovan\n"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "odintalova balk"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
#, fuzzy
msgid "<package>+"
msgstr "njdench %d balkov\n"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr "zobrazi vetky konfiguran sbory"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "neintalova dokumentciu"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
#, fuzzy
msgid "skip files with leading component <path> "
msgstr "vynecha sbory v ceste <cesta>"
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr "balk %s nie je naintalovan\n"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "skratka pre --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "balk %s nie je naintalovan\n"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <sbor_balku>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "vypisova znaky poas intalcie balka (vhodn s -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "neoverova architektru balka"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "neoverova operan systm balka"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "pred intalciou nekontrolova dostupn miesto na disku"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "intalova dokumentciu"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
#, fuzzy
msgid "install package(s)"
msgstr "intalova balk"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "aktualizova databzu bez zmeny sborovho systmu"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "neoverova zvislosti balka"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "zobrazi sbory v balku"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
#, fuzzy
msgid "don't install file security contexts"
msgstr "zobrazi vetky konfiguran sbory"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr "nemeni poradie balkov kvli vyrieeniu zvislost"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "nevykona iadne etapy"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "nevykona iadne etapy"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "nevykona iadne etapy"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nevykona iadne etapy"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nevykona iadne skripty span tmto balkom"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nevykona iadne skripty pecifikovan balkom"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nevykona iadne intalan skripty"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nevykona iadne intalan skripty"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nevykona iadne intalan skripty"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2069,53 +2057,41 @@ msgstr ""
"aktualizova na stariu verziu balka (--force to pri aktualizcii urob "
"automaticky)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "vypisova percent poas intalcie balka"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "presun balk do <adresra>, pokia to balk povouje"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:285
+#: lib/poptI.c:266
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "presun sbory zo <starej_cesty> do <novej_cesty>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <star_cesta>=<nov_cesta>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr ""
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "preintalova, pokia u balk existuje"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr ""
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr "neintalova, ale oznmi, i by to bolo mon"
-#: lib/poptI.c:303
+#: lib/poptI.c:278
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <sbor_balka>"
@@ -2368,56 +2344,51 @@ msgstr "podpsa balk (znii aktulny podpis)"
msgid "generate signature"
msgstr "vytvori PGP/GPG podpis"
-#: lib/psm.c:279
+#: lib/psm.c:269
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "oakvan zdrojov balk, njden binrny"
-#: lib/psm.c:390
+#: lib/psm.c:380
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "zdrojov balk neobsahuje iadny .spec sbor"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s vynechan - prenos zlyhal - %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "vykonanie skriptu zlyhalo"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "vykonanie skriptu zlyhalo"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1581
-#, fuzzy
-msgid "Unable to reload signature header\n"
-msgstr "Nie je mon preta ikonu: %s"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozbalenie archvu zlyhalo%s%s: %s"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " pre sbor "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "nepodarilo sa otvori %s: %s"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s zlyhalo"
@@ -2520,7 +2491,7 @@ msgstr "chybn slo balku: %s\n"
msgid "record %lu could not be read\n"
msgstr "zznam %d nie je mon preta\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "balk %s nie je naintalovan\n"
@@ -2670,8 +2641,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "- nie je podporovan pre reazce"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
@@ -2682,108 +2653,76 @@ msgstr "otvorenie %s zlyhalo\n"
msgid "unknown tag: \"%s\"\n"
msgstr "neznmy tag"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "nevyrieen zvislosti:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "neboli zadan iadne balky pre intalciu"
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr ""
-
-#: lib/rpminstall.c:180
-#, fuzzy
-msgid "Repackaging erased files..."
-msgstr "balk neobsahuje iadne sbory\n"
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr ""
-
-#: lib/rpminstall.c:201
-#, fuzzy
-msgid "Upgrading packages..."
-msgstr " --upgrade <sbor_balka>"
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Prena sa %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s vynechan - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie je mon naintalova\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "balk %s nie je naintalovan\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pri vytvran doasnho sboru %s"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, fuzzy, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "iadny z balkov nespa %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie je mon otvori sbor %s: %s"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" pecifikuje viac balkov\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie je mon otvori %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Intaluje sa %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr "Prena sa %s\n"
-
#: lib/rpmlead.c:100
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
@@ -3141,56 +3080,6 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Doplnenie podpisu: %d\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr "chyba pri tan hlaviky balka\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3341,143 +3230,143 @@ msgstr "znovu vytvori databzu z existujcej"
msgid "verify database files"
msgstr "opta sa spec sboru"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "nie je mon otvori %s na %s:%d"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "nie je mon otvori %s\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "nebola nastaven iadna dbpath"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "chyba pri natan zznamu %s z %s"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "chyba pri zpise zznamu %s do %s"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: otvorenie zlyhalo\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "nie je mon preta hlaviku na %d pre vyhadanie"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "chyba pri natan zznamu %s z %s"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "chyba pri natan zznamu %s z %s"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "chyba pri zpise zznamu %s do %s"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "chyba pri odstraovan zznamu %s z %s"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "chyba pri hadan balka %s\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "chyba pri zpise zznamu %s do %s"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "nebola nastaven iadna dbpath"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "doasn databza %s u existuje"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "nepodarilo sa odstrni adresr %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, fuzzy, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "zznam slo %d v databze je chybn -- bol vynechan"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "nie je mon prida zznam pvodne na %d"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr "nepodarilo sa znovu vytvori databzu; zostva pvodn\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "nepodarilo sa nahradi star databzu novou!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "nahrad sbory v %s sbormi z %s kvli obnove"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "nepodarilo sa odstrni adresr %s: %s\n"
@@ -3727,6 +3616,26 @@ msgid "%s: read manifest failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
#, fuzzy
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Nie je mon preta ikonu: %s"
+
+#, fuzzy
+#~ msgid "Repackaging erased files..."
+#~ msgstr "balk neobsahuje iadne sbory\n"
+
+#, fuzzy
+#~ msgid "Upgrading packages..."
+#~ msgstr " --upgrade <sbor_balka>"
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "Prena sa %s\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "chyba pri tan hlaviky balka\n"
+
+#, fuzzy
#~ msgid "%5d 0x%04x %s %s\n"
#~ msgstr "Sbor %4d: 0%o %s.%s\t %s\n"
diff --git a/po/sl.po b/po/sl.po
index bfb62c0b2..fb6197a2c 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\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"
@@ -85,178 +85,178 @@ msgstr "napaka pri branju glave paketa\n"
msgid "cannot re-open payload: %s\n"
msgstr "ni mono vnovi odpreti (payload): %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr ""
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
#, fuzzy
msgid "Signature options:"
msgstr "Dol. podpisa : %d\n"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr ""
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr ""
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "datoteka %s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM razliica %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, fuzzy, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "Ta program je dovoljeno razpeevati pod pogoji navedenimi v GNU GPL."
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "izbran sme biti le en glavni nain"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "samo en tip poizvedbe/preverjanja je moen naenkrat"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "nepriakovane zastavice pri poizvedbi"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "nepriakovana oblika poizvedbe"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "nepriakovan izvor poizvedbe"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "izbiri --relocate in --excludepath se lahko uporabi le pri namestitvi"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix se sme uporabiti le pri namestitvi"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti izbire --prefix se morajo zaeti z /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "izbiri --excludedocs in --includedocs se medsebojno izkljuujeta"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos sme podan le ob namestitvi paketa"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles sme biti podati le ob namestitvi paketa"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpmqv.c:469
+#: rpmqv.c:467
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpmqv.c:474
+#: rpmqv.c:472
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -264,14 +264,14 @@ msgstr ""
"--nodeps sme biti podan le ob izgradnji, vnovini izgradnji, prevajanju, "
"namestitvi, odstranitvi ali preverjanju paketa"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -279,83 +279,83 @@ msgstr ""
"--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
"vnovini izgradnji paketa"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti izbire --root (-r) se morajo zaeti z /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "ni datotek, ki bi jih lahko podpisal\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "dostop do datoteke %s ni moen\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp manjka: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Vnesite pristopno geslo: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Preverjanje pristopnega gesla neuspeno\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Pristopno geslo je pravo.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Neveljaven %%_signature v makro-datoteki.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign sme biti podan le ob izgradnji paketa"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "izvajanje je bilo neuspeno\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "paketi za vnovino izgradnjo niso navedeni"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "datoteka spec za izgradnjo manjka"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "arhiv tar za izgradnjo manjka"
-#: rpmqv.c:718
+#: rpmqv.c:715
#, fuzzy
msgid "no packages given for erase"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "argumenti za poizvedbo niso podani"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "argumenti za preverjanje niso podani"
-#: rpmqv.c:802
+#: rpmqv.c:792
#, fuzzy
msgid "no arguments given"
msgstr "argumenti za poizvedbo niso podani"
@@ -583,7 +583,7 @@ msgstr "Datoteki manjka uvodni \"/\": %s"
msgid "Glob not permitted: %s\n"
msgstr "vrstica %d: Razliica ni dovoljena: %s"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, fuzzy, c-format
msgid "File not found by glob: %s\n"
msgstr "Datoteke ni mono najti z raziritvijo metaznakov v imenu: %s"
@@ -754,7 +754,7 @@ msgstr "Ikone %s ni mono prebrati: %s"
msgid "Could not open %s: %s\n"
msgstr "Ni mono odpreti %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, fuzzy, c-format
msgid "Unable to write package: %s\n"
msgstr "Ni mono zapisati paketa: %s"
@@ -1297,19 +1297,19 @@ msgstr "brez preverjanja soodvisnosti paketa"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "brez preverjanja soodvisnosti paketa"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
#, fuzzy
msgid "don't verify database header(s) when retrieved"
msgstr "brez preverjanja arhitekture paketa"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
#, fuzzy
msgid "don't verify package signature(s)"
@@ -1354,7 +1354,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Ni mono izvesti %s: %s"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, fuzzy, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Vejitev %s ni mona: %s"
@@ -1860,41 +1860,33 @@ msgstr ""
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "poti, ki niso obdelane, se morajo zaeti z /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "premikanja se morajo zaeti z /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "premikanja morajo vsebovati ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "premikanja morajo imeti /, ki mu sledi ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
#, fuzzy
msgid "add suggested packages to transaction"
msgstr "poizvedba po paketu v skupini"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"namestitev vseh datotek, vkljuno z nastavitvenimi, ki so sicer izpuene"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1902,168 +1894,164 @@ msgstr ""
"odstrani vse pakete, ki vsebujejo vzorec <paket> (sicer program izide z "
"napako, e paket <paket> doloa ve paketov)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "brez izvajanja skriptov paketa"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr "poti %s ni mono premakniti za paket %s-%s-%s"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "izbrii (odstrani) paket"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
#, fuzzy
msgid "<package>+"
msgstr "ni paketov\n"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr "izpis vseh nastavitvene datoteke"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "brez namestitve dokumentacije"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
#, fuzzy
msgid "skip files with leading component <path> "
msgstr "preskok datotek v navedeni poti"
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr "poti %s ni mono premakniti za paket %s-%s-%s"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "okrajava za --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "paket %s-%s-%s je e nameen"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <paket>+ "
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "z izpisom znakov # ob namestitvi (uporabno z -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "brez preverjanja arhitekture paketa"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "brez preverjanja operacijskega sistema paketa"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "brez preverjanja prostora na disku pred nameanjem"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "namesti dokumentacijo"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
#, fuzzy
msgid "install package(s)"
msgstr "nameanje paketa"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "obnovi podatkovno zbirko, a ne spreminjaj datotenega sistema"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "brez preverjanja soodvisnosti paketa"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
#, fuzzy
msgid "don't install file security contexts"
msgstr "izpis vseh nastavitvene datoteke"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "brez izvajanja katerihkoli skriptov, ki jih poene ta paket"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "brez izvajanja skriptov paketa"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2071,53 +2059,41 @@ msgstr ""
"nadgraditev na starejo razliico paketa (--force pri nadgradnjah "
"avtomatino vkljui to izbiro)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "izpis odstotkov med namestitvijo"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "e je mogoe, bo paket prestavljen v imenik <imenik>"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:285
+#: lib/poptI.c:266
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "prestavljanje datoteke iz stare poti v novo"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <starapot>=<novapot>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr ""
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "ponovno namesti, e paket e obstaja"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr ""
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr "ne namesti, a ugotovi, e bi delovalo"
-#: lib/poptI.c:303
+#: lib/poptI.c:278
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <paket> "
@@ -2368,56 +2344,51 @@ msgstr "podpii paket(e) (trenutni podpis zavrzi)"
msgid "generate signature"
msgstr "izdelava podpisa PGP/GPG"
-#: lib/psm.c:279
+#: lib/psm.c:269
#, fuzzy
msgid "source package expected, binary found\n"
msgstr "priakovan je bil izvorni paket, najden binarni"
-#: lib/psm.c:390
+#: lib/psm.c:380
#, fuzzy
msgid "source package contains no .spec file\n"
msgstr "izvorni paket ne vsebuje datoteke .spec"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "preskoeno - %s - prenos neuspeen - %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "skript se ni uspeno izvedel"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "skript se ni uspeno izvedel"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1581
-#, fuzzy
-msgid "Unable to reload signature header\n"
-msgstr "Ikone %s ni mono prebrati: %s"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, fuzzy, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "raziritev arhiva je bilo neuspeno%s%s: %s"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " za datoteko "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "neuspeno odpiranje %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s neuspeen"
@@ -2520,7 +2491,7 @@ msgstr "neveljavna tevilka paketa: %s\n"
msgid "record %lu could not be read\n"
msgstr "zapisa %d ni mono prebrati\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s ni nameen\n"
@@ -2673,8 +2644,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "- ni podprt za nize"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2685,108 +2656,76 @@ msgstr "odpiranje %s je bilo neuspeno: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "neznana znaka"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "neuspene soodvisnosti:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
#, fuzzy
msgid "Preparing packages for installation..."
msgstr "paketi za namestitev niso navedeni"
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr ""
-
-#: lib/rpminstall.c:180
-#, fuzzy
-msgid "Repackaging erased files..."
-msgstr "paket ne vsebuje datotek\n"
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr ""
-
-#: lib/rpminstall.c:201
-#, fuzzy
-msgid "Upgrading packages..."
-msgstr " --upgrade <paket> "
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Prenaanje %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "preskoeno - %s - prenos neuspeen - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ni mono namestiti\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "paketa %s ni mono premakniti\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "napaka pri branju iz datoteke %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "datoteka %s zahteva novejo razliico RPM\n"
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, fuzzy, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "noben paket ne proi %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ni mono odpreti datoteke %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" doloa ve paketov\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ni mono odpreti %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Nameanje %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr "Prenaanje %s\n"
-
#: lib/rpmlead.c:100
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
@@ -3145,56 +3084,6 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Dol. polnila : %d\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr "napaka pri branju glave paketa\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3347,145 +3236,145 @@ msgstr "ponovno izgradi zbirko iz obstojeih glav"
msgid "verify database files"
msgstr "poizvedba po datoteki spec"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: neprepoznano ime znake: \"%s\" prezrto\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "ni mono odpreti kazala %s z uporabo db%d - %s (%d)"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "ni mono odpreti kazala %s:"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "dbpath ni nastavljena"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "napaka(%d) pri pisanju zapisa %s v %s"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: branje Fread je bilo neuspeno: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: odpiranje je bilo neuspeno: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ni mono prebrati glave pri 0x%x"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "napaka(%d) pri pisanju zapisa %s v %s"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "napaka(%d) pri brisanju zapisa %s iz %s"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "napaka(%d) pri iskanju paketa %s\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "napaka(%d) pri pisanju zapisa %s v %s"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "dbpath ni nastavljena"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "zaasna podatkovna zbirka %s e obstaja"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "neuspena odstranitev imenika %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, fuzzy, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "zapis t. %d v zbirki je pokodovan -- preskoeno."
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "zapisa ni mono dodati na %d"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ponovna izgradnja podatkovne zbirke je bila neuspena; stara ostaja na\n"
"istem mestu\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspena!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspena odstranitev imenika %s: %s\n"
@@ -3735,6 +3624,26 @@ msgid "%s: read manifest failed: %s\n"
msgstr "%s: branje Fread je bilo neuspeno: %s\n"
#, fuzzy
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Ikone %s ni mono prebrati: %s"
+
+#, fuzzy
+#~ msgid "Repackaging erased files..."
+#~ msgstr "paket ne vsebuje datotek\n"
+
+#, fuzzy
+#~ msgid "Upgrading packages..."
+#~ msgstr " --upgrade <paket> "
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "Prenaanje %s\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "napaka pri branju glave paketa\n"
+
+#, fuzzy
#~ msgid "%5d 0x%04x %s %s\n"
#~ msgstr "Datoteka: %4d: %07o %s.%s\t %s\n"
diff --git a/po/sr.po b/po/sr.po
index 71d20491a..55c81c563 100644
--- a/po/sr.po
+++ b/po/sr.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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2008-01-10 22:07-0000\n"
"Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
"Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -86,165 +86,165 @@ msgstr "грешка при читању заглавља из пакета\n"
msgid "cannot re-open payload: %s\n"
msgstr "не могу да поново отворим товар: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Опције упита (уз -q или --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Опције провере (уз -V или --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr "Опције извора (уз --query или --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr "Опције шетње кроз стабло датотека (уз --ftswalk):"
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Опције потписа:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Опције базе података:"
-#: rpmqv.c:107
+#: rpmqv.c:105
#, fuzzy
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Опције прављења уз [ <датспец> | <tarball> | <изворни пакет> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Опције инсталације/надградње/брисања:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "Заједничке опције за све rpm режиме и извршне програме:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM верзија %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr "Ауторска права 1998-2002 - Red Hat, Inc.\n"
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "Овај програм се сме слободно дистрибуирати под ГНУ ОЈЛ одредбама.\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Интерна грешка при обради аргумената (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "само један главни режим сме бити наведен"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "једна врста упита/провере сме бити урађена одједном"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "неочекиване заставице упита"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "неочекиван облик упита"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "неочекивани извор упита"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "само инсталација, надградња, rmsource и rmspec могу бити приморани"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "датотеке смеју бити премештане само током инсталације пакета"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr "не може се користити --prefix уз --relocate или --excludepath"
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate и --excludepath могу бити употребљене само при инсталацији нових "
"пакета"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix може бити употребљена само при инсталацији нових пакета"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "аргументи за --prefix морају почети знаком /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) може бити наведена само током инсталације пакета"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent може бити наведена само током инсталације пакета"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs може бити наведена само током инсталације пакета"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludecocs може бити наведена само током инсталације пакета"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includecocs може бити наведена само током инсталације пакета"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "може се навести само једна од --excludedocs или --includedocs"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch може бити наведена само током инсталације пакета"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos може бити наведена само током инсталације пакета"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize може бити наведена само током инсталације пакета"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches може бити наведена само током брисања пакета"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles може бити наведена само током инсталације пакета"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb може бити наведена само током инсталације и брисања пакета"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -252,7 +252,7 @@ msgstr ""
"опције искључивања скрипте могу бити наведене само током инсталације и "
"брисања пакета"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -260,7 +260,7 @@ msgstr ""
"опције искључивања активације могу бити наведене само током инсталације и "
"брисања пакета"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -268,14 +268,14 @@ msgstr ""
"--nodeps може бити наведена само током прављења, поновног прављења, поновног "
"компилирања, брисања, и провере пакета"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test може бити наведена само током инсталације, брисања, и прављења пакета"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -283,82 +283,82 @@ msgstr ""
"--root (-r) може бити наведена само током инсталације, брисања, упита, и "
"поновног прављења базе података"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "аргументи за --root (-r) морају почети знаком /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "нема датотека за потписивање\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "не могу да приступим датотеци %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp није пронађен: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Унесите лозинку: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Неуспела провера лозинке\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Лозинка је добра.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Неисправна %%_signature спецификација у макро датотеци.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign може бити наведена само током прављења пакета"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "неуспело извршавање\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "нема задатих пакета за прављење"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "нема задатих датотека спецификације за прављење "
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "нема задатих tar датотека за прављење"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "нема задатих пакета за брисање"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "нема задатих пакета за инсталацију"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "нема задатих аргумената за упит"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "нема задатих аргумената за проверу"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "нема задатих аргумената"
@@ -576,7 +576,7 @@ msgstr "Датотеци је потребно „/“ испред: %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Поклапање није дозвољено: %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, fuzzy, c-format
msgid "File not found by glob: %s\n"
msgstr "Датотека није пронађена поклапањем: %s\n"
@@ -745,7 +745,7 @@ msgstr "Не могу да поново учитам заглавље потпи
msgid "Could not open %s: %s\n"
msgstr "Не могу да отворим %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Не могу да запишем пакет: %s\n"
@@ -1284,17 +1284,17 @@ msgstr "немаој проверавати зависности прављењ
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "немој проверавати сажетке пакета"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "немој проверавати заглавља базе података по добављању"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "немој проверавати потписе пакета"
@@ -1337,7 +1337,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Не могу да извршим %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, fuzzy, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Не могу да отворим %s: %s\n"
@@ -1836,40 +1836,32 @@ msgstr ""
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "путање изостављања морају почињати са /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "премештања морају почети са /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "премештања морају садржати ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "премештања морају имати / након ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr "додај предложене пакете трансакцији"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"инсталирај све датотеке, чак и подешавања која би иначе могла бити прескочена"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1877,209 +1869,193 @@ msgstr ""
"уклони све пакете који одговарају <пакету> (обично се пријављује грешка ако "
"<пакет> одређује више пакета)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "немој извршити скриптице пакета"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr "премести датотеке у пакету који се не може преместити"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "избриши (деинсталирај) пакет"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<пакет>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "немој инсталирати датотеке подешавања"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "немој да инсталираш документацију"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr "отркиј сукобе датотека између пакета"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "скраћеница за --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "надгради пакете ако су већ инсталирани"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
#, fuzzy
msgid "<packagefile>+"
msgstr "<датпакета>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "исиписуј знак тарабе док се пакет инсталира (добро уз -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "немој проверавати архитектуру пакета"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "немој проверавати оперативни систем пакета"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "инсталирај документацију"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "инсталирај пакете"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "ажурирај базу података, али немој мењати систем датотека"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "немој проверавати зависности пакета"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "немој проверавати MD5 сажетке датотека"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr "немој инсталирати безбедносне контексте датотека"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"немој преуређивати редослед инсталације пакета ради задовољавања зависности"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "немој извршити %%pre скриптицу (ако постоји)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "немој извршити %%post скриптицу (ако постоји)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "немој извршити %%preun скриптицу (ако постоји)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "немој извршити %%postun скриптицу (ако постоји)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "немој извршити ниједну скриптицу коју активира овај пакет"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "немој извршити ниједну %%triggerprein скриптицу"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "немој извршити ниједну %%triggerin скриптицу"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "немој извршити ниједну %%triggerun скриптицу"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "немој извршити ниједну %%triggerpostun скриптицу"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
"надгради на стару верзију пакета (--force код надградње ово ради самостално)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "исписуј проценте док се пакет инсталира"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "премести пакет у <дир>, ако се може преместити"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "премести датотеке из путање <старо> у <ново>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<старо>=<ново>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr ""
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "поново инсталирај ако је пакет већ присутан"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr ""
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr "немој инсталирати, али реци да ли би радило или не"
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "надгради пакете"
@@ -2300,53 +2276,49 @@ msgstr "потпиши пакете (истоветно са --addsign)"
msgid "generate signature"
msgstr "направи потпис"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "изворни пакет не садржи .spec датотеку\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s(%s-%s-%s.%s) скриптица није успела, waitpid(%d) rc %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s(%s-%s-%s.%s) скриптица није успела, сигнал %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "%s(%s-%s-%s.%s) скриптица није успела, излазни статус %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "Не могу да поново учитам заглавље потписа\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "распакивање архиве није успело %s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr ""
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s није успело код датотеке %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s није успело: %s\n"
@@ -2447,7 +2419,7 @@ msgstr "неисправан број пакета: %s\n"
msgid "record %lu could not be read\n"
msgstr "слог %u не може бити прочитан\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "пакет %s није инсталиран\n"
@@ -2594,8 +2566,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr ""
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2606,104 +2578,74 @@ msgstr "отварање %s није успело: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "непозната ознака: \"%s\"\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Неуспеле зависности:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Припремам пакете за инсталацију..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr ""
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr ""
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr ""
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "Надграђујем пакете..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Прибављам %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "прескачем %s - неуспео пренос - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s се не може инсталирати\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, c-format
msgid "package %s is not relocatable\n"
msgstr "пакет %s се не може премештати\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "грешка при читању из датотеке %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: није rpm пакет (или манифест пакета): %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "не могу да отворим датотеку %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "„%s“ одређује више пакета\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "не могу да отворим %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Инсталирам %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr "\tУклањам %s:\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3052,55 +2994,6 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr "Неуспело читање поново запакованог пакета!\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, c-format
msgid "missing %c %s"
@@ -3249,141 +3142,141 @@ msgstr ""
msgid "verify database files"
msgstr "провера датотека базе података"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "не могу да отворим %s индекс користећи db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "не могу да отворим %s индекс\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "није постављен dbpath\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "грешка(%d) при добављању \"%s\" слогова из %s индекса\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "грешка(%d) при записивању слога #%d у %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Неуспео fseek: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: отварање није успело: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: не могу да прочитам заглавње на 0x%x\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "грешка(%d) при постављању заглавља #%d слога за %s уклањање\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "грешка(%d) при постављању \"%s\" слогова из %s индекса\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "грешка(%d) при складиштењу слога \"%s\" у %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "грешка(%d) при уклањању слога \"%s\" из %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "грешка(%d) при заузимању новог примерка пакета\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "грешка(%d) при записивању слога %s у %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "није постављен dbpath"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "привремена база података %s већ постоји\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "неуспело уклањање директоријума %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "заглавље #%u у бази податак је лоше -- прескачем.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "не могу да додам слог првобитно на %u\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "неуспело уклањање директоријума %s: %s\n"
@@ -3626,6 +3519,18 @@ msgstr "%s: неуспела радња кеширања: бг %d.\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: неуспело читање манифеста: %s\n"
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Не могу да поново учитам заглавље потписа\n"
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "Надграђујем пакете..."
+
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "\tУклањам %s:\n"
+
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "Неуспело читање поново запакованог пакета!\n"
+
#~ msgid "%5d 0x%04x %s %s\n"
#~ msgstr "%5d 0x%04x %s %s\n"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index afb880265..4f386613d 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2008-01-10 22:07-0000\n"
"Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
"Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -86,165 +86,165 @@ msgstr "greška pri čitanju zaglavlja iz paketa\n"
msgid "cannot re-open payload: %s\n"
msgstr "ne mogu da ponovo otvorim tovar: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Opcije upita (uz -q ili --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Opcije provere (uz -V ili --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr "Opcije izvora (uz --query ili --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr "Opcije šetnje kroz stablo datoteka (uz --ftswalk):"
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Opcije potpisa:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Opcije baze podataka:"
-#: rpmqv.c:107
+#: rpmqv.c:105
#, fuzzy
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Opcije pravljenja uz [ <datspec> | <tarball> | <izvorni paket> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Opcije instalacije/nadgradnje/brisanja:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "Zajedničke opcije za sve rpm režime i izvršne programe:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzija %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr "Autorska prava 1998-2002 - Red Hat, Inc.\n"
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "Ovaj program se sme slobodno distribuirati pod GNU OJL odredbama.\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Interna greška pri obradi argumenata (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "samo jedan glavni režim sme biti naveden"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "jedna vrsta upita/provere sme biti urađena odjednom"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "neočekivane zastavice upita"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "neočekivan oblik upita"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "neočekivani izvor upita"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "samo instalacija, nadgradnja, rmsource i rmspec mogu biti primorani"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "datoteke smeju biti premeštane samo tokom instalacije paketa"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr "ne može se koristiti --prefix uz --relocate ili --excludepath"
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate i --excludepath mogu biti upotrebljene samo pri instalaciji novih "
"paketa"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix može biti upotrebljena samo pri instalaciji novih paketa"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti za --prefix moraju početi znakom /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) može biti navedena samo tokom instalacije paketa"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent može biti navedena samo tokom instalacije paketa"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs može biti navedena samo tokom instalacije paketa"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludecocs može biti navedena samo tokom instalacije paketa"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includecocs može biti navedena samo tokom instalacije paketa"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "može se navesti samo jedna od --excludedocs ili --includedocs"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch može biti navedena samo tokom instalacije paketa"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos može biti navedena samo tokom instalacije paketa"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize može biti navedena samo tokom instalacije paketa"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches može biti navedena samo tokom brisanja paketa"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles može biti navedena samo tokom instalacije paketa"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb može biti navedena samo tokom instalacije i brisanja paketa"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -252,7 +252,7 @@ msgstr ""
"opcije isključivanja skripte mogu biti navedene samo tokom instalacije i "
"brisanja paketa"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -260,7 +260,7 @@ msgstr ""
"opcije isključivanja aktivacije mogu biti navedene samo tokom instalacije i "
"brisanja paketa"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -268,7 +268,7 @@ msgstr ""
"--nodeps može biti navedena samo tokom pravljenja, ponovnog pravljenja, "
"ponovnog kompiliranja, brisanja, i provere paketa"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -276,7 +276,7 @@ msgstr ""
"--test može biti navedena samo tokom instalacije, brisanja, i pravljenja "
"paketa"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -284,82 +284,82 @@ msgstr ""
"--root (-r) može biti navedena samo tokom instalacije, brisanja, upita, i "
"ponovnog pravljenja baze podataka"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti za --root (-r) moraju početi znakom /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "nema datoteka za potpisivanje\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "ne mogu da pristupim datoteci %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp nije pronađen: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Unesite lozinku: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Neuspela provera lozinke\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Lozinka je dobra.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Neispravna %%_signature specifikacija u makro datoteci.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign može biti navedena samo tokom pravljenja paketa"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "neuspelo izvršavanje\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "nema zadatih paketa za pravljenje"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "nema zadatih datoteka specifikacije za pravljenje "
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "nema zadatih tar datoteka za pravljenje"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "nema zadatih paketa za brisanje"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "nema zadatih paketa za instalaciju"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "nema zadatih argumenata za upit"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "nema zadatih argumenata za proveru"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "nema zadatih argumenata"
@@ -577,7 +577,7 @@ msgstr "Datoteci je potrebno „/“ ispred: %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Poklapanje nije dozvoljeno: %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, fuzzy, c-format
msgid "File not found by glob: %s\n"
msgstr "Datoteka nije pronađena poklapanjem: %s\n"
@@ -746,7 +746,7 @@ msgstr "Ne mogu da ponovo učitam zaglavlje potpisa.\n"
msgid "Could not open %s: %s\n"
msgstr "Ne mogu da otvorim %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Ne mogu da zapišem paket: %s\n"
@@ -1285,17 +1285,17 @@ msgstr "nemaoj proveravati zavisnosti pravljenja"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr ""
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "nemoj proveravati sažetke paketa"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "nemoj proveravati zaglavlja baze podataka po dobavljanju"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "nemoj proveravati potpise paketa"
@@ -1338,7 +1338,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Ne mogu da izvršim %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, fuzzy, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Ne mogu da otvorim %s: %s\n"
@@ -1837,41 +1837,33 @@ msgstr ""
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "putanje izostavljanja moraju počinjati sa /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "premeštanja moraju početi sa /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "premeštanja moraju sadržati ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "premeštanja moraju imati / nakon ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr "dodaj predložene pakete transakciji"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"instaliraj sve datoteke, čak i podešavanja koja bi inače mogla biti "
"preskočena"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1879,209 +1871,193 @@ msgstr ""
"ukloni sve pakete koji odgovaraju <paketu> (obično se prijavljuje greška ako "
"<paket> određuje više paketa)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "nemoj izvršiti skriptice paketa"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr "premesti datoteke u paketu koji se ne može premestiti"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "izbriši (deinstaliraj) paket"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<paket>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "nemoj instalirati datoteke podešavanja"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "nemoj da instaliraš dokumentaciju"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr "otrkij sukobe datoteka između paketa"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "skraćenica za --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "nadgradi pakete ako su već instalirani"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
#, fuzzy
msgid "<packagefile>+"
msgstr "<datpaketa>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "isipisuj znak tarabe dok se paket instalira (dobro uz -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "nemoj proveravati arhitekturu paketa"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "nemoj proveravati operativni sistem paketa"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "instaliraj dokumentaciju"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "instaliraj pakete"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "ažuriraj bazu podataka, ali nemoj menjati sistem datoteka"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "nemoj proveravati zavisnosti paketa"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "nemoj proveravati MD5 sažetke datoteka"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr "nemoj instalirati bezbednosne kontekste datoteka"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"nemoj preuređivati redosled instalacije paketa radi zadovoljavanja zavisnosti"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "nemoj izvršiti %%pre skripticu (ako postoji)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "nemoj izvršiti %%post skripticu (ako postoji)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "nemoj izvršiti %%preun skripticu (ako postoji)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nemoj izvršiti %%postun skripticu (ako postoji)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nemoj izvršiti nijednu skripticu koju aktivira ovaj paket"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nemoj izvršiti nijednu %%triggerprein skripticu"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nemoj izvršiti nijednu %%triggerin skripticu"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nemoj izvršiti nijednu %%triggerun skripticu"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nemoj izvršiti nijednu %%triggerpostun skripticu"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
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:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "ispisuj procente dok se paket instalira"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "premesti paket u <dir>, ako se može premestiti"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "premesti datoteke iz putanje <staro> u <novo>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<staro>=<novo>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr ""
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "ponovo instaliraj ako je paket već prisutan"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr ""
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
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:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "nadgradi pakete"
@@ -2302,53 +2278,49 @@ msgstr "potpiši pakete (istovetno sa --addsign)"
msgid "generate signature"
msgstr "napravi potpis"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr ""
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "izvorni paket ne sadrži .spec datoteku\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s(%s-%s-%s.%s) skriptica nije uspela, waitpid(%d) rc %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s(%s-%s-%s.%s) skriptica nije uspela, signal %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "%s(%s-%s-%s.%s) skriptica nije uspela, izlazni status %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr ""
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "Ne mogu da ponovo učitam zaglavlje potpisa\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "raspakivanje arhive nije uspelo %s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr ""
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s nije uspelo kod datoteke %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s nije uspelo: %s\n"
@@ -2449,7 +2421,7 @@ msgstr "neispravan broj paketa: %s\n"
msgid "record %lu could not be read\n"
msgstr "slog %u ne može biti pročitan\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
@@ -2596,8 +2568,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr ""
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2608,104 +2580,74 @@ msgstr "otvaranje %s nije uspelo: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "nepoznata oznaka: \"%s\"\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Neuspele zavisnosti:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Pripremam pakete za instalaciju..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr ""
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr ""
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr ""
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "Nadgrađujem pakete..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Pribavljam %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "preskačem %s - neuspeo prenos - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s se ne može instalirati\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, c-format
msgid "package %s is not relocatable\n"
msgstr "paket %s se ne može premeštati\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "greška pri čitanju iz datoteke %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: nije rpm paket (ili manifest paketa): %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ne mogu da otvorim datoteku %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "„%s“ određuje više paketa\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ne mogu da otvorim %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr "\tUklanjam %s:\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3054,55 +2996,6 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr ""
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr "Neuspelo čitanje ponovo zapakovanog paketa!\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, c-format
msgid "missing %c %s"
@@ -3252,141 +3145,141 @@ msgstr ""
msgid "verify database files"
msgstr "provera datoteka baze podataka"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "ne mogu da otvorim %s indeks koristeći db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "ne mogu da otvorim %s indeks\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "nije postavljen dbpath\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "greška(%d) pri dobavljanju \"%s\" slogova iz %s indeksa\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "greška(%d) pri zapisivanju sloga #%d u %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Neuspeo fseek: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: otvaranje nije uspelo: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ne mogu da pročitam zaglavnje na 0x%x\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "greška(%d) pri postavljanju zaglavlja #%d sloga za %s uklanjanje\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "greška(%d) pri postavljanju \"%s\" slogova iz %s indeksa\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "greška(%d) pri skladištenju sloga \"%s\" u %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "greška(%d) pri uklanjanju sloga \"%s\" iz %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "greška(%d) pri zauzimanju novog primerka paketa\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "greška(%d) pri zapisivanju sloga %s u %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "nije postavljen dbpath"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "privremena baza podataka %s već postoji\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "neuspelo uklanjanje direktorijuma %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "zaglavlje #%u u bazi podatak je loše -- preskačem.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "ne mogu da dodam slog prvobitno na %u\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspelo uklanjanje direktorijuma %s: %s\n"
@@ -3629,6 +3522,18 @@ msgstr "%s: neuspela radnja keširanja: bg %d.\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: neuspelo čitanje manifesta: %s\n"
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Ne mogu da ponovo učitam zaglavlje potpisa\n"
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "Nadgrađujem pakete..."
+
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "\tUklanjam %s:\n"
+
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "Neuspelo čitanje ponovo zapakovanog paketa!\n"
+
#~ msgid "%5d 0x%04x %s %s\n"
#~ msgstr "%5d 0x%04x %s %s\n"
diff --git a/po/sv.po b/po/sv.po
index 2859f1335..9163d32b8 100644
--- a/po/sv.po
+++ b/po/sv.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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\n"
"PO-Revision-Date: 2005-02-18 22:29+0100\n"
"Last-Translator: Gran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -79,164 +79,164 @@ msgstr "fel vid lsning av pakethuvud\n"
msgid "cannot re-open payload: %s\n"
msgstr "kan inte terppna lasten: %s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Frgeflaggor (med -q eller --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Verifieringsflaggor (med -V eller --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr "Kllflaggor (med --query eller --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr "Flaggor fr traversering av filtrd (med --ftswalk):"
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "Signaturflaggor:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Databasflaggor:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Byggflaggor med [ <specfil> | <tar-arkiv> | <kllpaket> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Installations-/Uppdaterings-/Raderingsflaggor"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "Gemensamma flaggor fr alla rpm-lgen och binrer:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "Detta program kan distribueras fritt enligt villkoren i GNU GPL\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Internt fel i argumenthantering (%d) :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "enbart ett huvudlge kan anges"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "endast en typ av frga/verifiering kan utfras t gngen"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "ovntade frgeflaggor"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "ovntat frgeformat"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "ovntad frgeklla"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "filer kan relokeras endast under paketinstallation"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr "kan inte anvnda --prefix med --relocate eller --excludepath"
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate och --excludepath kan endast anvndas nr nya paket installeras"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan endast anvndas nr nya paket installeras"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "argument till --prefix mste brja med /"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan enbart anvndas vid paketinstallation"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent kan enbart anvndas vid paketinstallation"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs kan enbart anvndas vid paketinstallation"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs kan enbart anvndas vid paketinstallation"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs kan enbart anvndas vid paketinstallation"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "enbart en av --excludedocs och --includedocs kan anvndas"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch kan enbart anvndas vid paketinstallation"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos kan enbart anvndas vid paketinstallation"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize kan enbart anvndas vid paketinstallation"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches kan enbart anvndas nr paket raderas"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles kan enbart anvndas vid paketinstallation"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb kan enbart anvndas nr paket installeras eller raderas"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -244,7 +244,7 @@ msgstr ""
"skriptinaktiveringsflaggor kan enbart anvndas nr paket installeras eller "
"raderas"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -252,7 +252,7 @@ msgstr ""
"utlsarinaktiveringsflaggor kan enbart anvndas nr paket installeras eller "
"raderas"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -260,13 +260,13 @@ msgstr ""
"--nodeps kan enbart anvndas nr paket byggs, byggs om, kompileras om, "
"installeras, raderas eller verifieras"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test kan enbart anvndas nr paket installeras, raderas eller byggs"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -274,82 +274,82 @@ msgstr ""
"--root (-r) kan enbart anvndas nr paket installeras, raderas, frgas eller "
"databasen byggs om"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "argument till --root (-r) mste brja med /"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "inga filer att signera\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "kan inte komma t filen %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp hittades inte: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Ange lsenfras: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Kontrollen av lsenfrasen misslyckades\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Lsenfrasen r ok.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Felaktig %%_signature-spec i makrofil.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign kan enbart anvndas vid paketbyggnation"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "exec misslyckades\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "inga paketfiler angivna fr ombyggnation"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "inga specfiler angivna fr byggnation"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "inga tar-filer angivna fr byggnation"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "inga paket angivna att radera"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "inga paket angivna fr installation"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "inga parametrar angivna fr frga"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "inga parametrar angivna fr verifiering"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "inga argument angivna"
@@ -566,7 +566,7 @@ msgstr "Filen behver inledande \"/\": %s\n"
msgid "Glob not permitted: %s\n"
msgstr "Matchning inte tilltet: %s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Hittade ingen fil vid matchningen: %s\n"
@@ -735,7 +735,7 @@ msgstr "Kan inte lsa om signaturhuvud.\n"
msgid "Could not open %s: %s\n"
msgstr "Kunde inte ppna %s: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "Kunde inte skriva paket: %s\n"
@@ -1265,17 +1265,17 @@ msgstr "verifiera inte byggberoenden"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr "generera pakethuvuden kompatibla med (ldre) rpm[23]-paketering"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "verifiera inte paketkontrollsummor"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "verifiera inte databashuvuden nr de hmtas"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "verifiera inte paketsignatur(er)"
@@ -1317,7 +1317,7 @@ msgstr "generera huvuden kompatibla med (ldre) rpm[23]-paketering"
msgid "Couldn't exec %s: %s\n"
msgstr "Kunde inte kra %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, fuzzy, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Kunde inte ppna %s: %s\n"
@@ -1807,40 +1807,32 @@ msgstr "felsk cache-hanteringen av URL:ar"
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: flaggtabell felkonfigurerad (%d)\n"
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "uteslutna skvgar mste brja med /"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "omflyttningar mste brja med /"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "omflyttningar mste innehlla ett ="
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "omflyttningar mste ha ett / efter ="
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr "terstllning tar en tid-/datumstmpel som argument"
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr "felformaterat tid-/datumstmpelargument fr terstllning"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr "lgg till freslagna paket till transaktion"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"installera alla filer, ven konfigurationer som annars kunde hoppats ver"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1848,156 +1840,152 @@ msgstr ""
"ta bort alla paket som matchar <paket> (normalt ger det ett fel om <paket> "
"anger flera paket)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "kr inte paketskript"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr "relokera filer i ej relokerbart paket"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr "skriv beroendecykler som varningar"
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr "spara raderade paketfiler genom att spara dem i underkatalog"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "radera (avinstallera) paket"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<paket>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "installera inte konfigurationsfiler"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "installera inte dokumentation"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "hoppa ver filer med inledande <skvg>"
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<skvg>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr "upptck filkonflikter mellan paket"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "kortform fr --replacepkgs --replacefiles"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "uppgradera paket om redan installerade"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<paketfil>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr ""
"skriv ut brdgrdar allteftersom paketet installeras (bra tillsammans med -v)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "verifiera inte paketarkitektur"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "verifiera inte paketets operativsystem"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "kontrollera inte diskutrymme fre installation"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "installera dokumentation"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "installera paket"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "uppdatera databasen, men ndra inte filsystemet"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "verifiera inte paketberoenden"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "verifiera inte MD5-summor fr filer"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr "installera inte filskerhetskontexter"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr "flytta inte om paketinstallationen fr att tillfredsstlla beroenden"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr "fresl inte lsning(ar) p saknade beroenden"
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "utfr inte (eventuellt) %%pre-skript"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "utfr inte (eventuellt) %%post-skript"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "utfr inte (eventuellt) %%preun-skript"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "utfr inte (eventuellt) %%postun-skript"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "kr inte skript utlsta av detta paket"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "kr inte %%triggerprein-skript"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "kr inte %%triggerin-skript"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "kr inte %%triggerun-skript"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "kr inte %%triggerpostun-skript"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2005,51 +1993,39 @@ msgstr ""
"uppgradera till en gammal version av paketet (--force vid uppgraderingar gr "
"detta automatiskt)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "skriv procent allt eftersom paketet installeras"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "flytta paketet till <katalog>, om flyttbart"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<kat>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "relokera filer frn <gammal> till <ny>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<gammal>=<ny>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "spara raderade paketfiler genom ompaketering"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr "ingorera filkonflikter mellan paket"
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "ominstallera nr paketet redan r installerat"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr "avinstallera nya, ominstallera gamla, paket tillbaka till <datum>"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<datum>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
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:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "uppgradera paket"
@@ -2264,53 +2240,49 @@ msgstr "signera paket (detsamma som --addsign)"
msgid "generate signature"
msgstr "generera signatur"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "kllpaket frvntades, fann binrpaket\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "kllpaket innehller ingen .spec-fil\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s(%s-%s-%s.%s) skript misslyckades, waitpid(%d) rk %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s(%s-%s-%s.%s) skript misslyckades, slutstatus %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "%s(%s-%s-%s.%s) skript misslyckades, slutstatus %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: %s-skript misslyckades (%d), hoppar ver %s\n"
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "Kan inte lsa om signaturhuvud\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " vid fil "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s misslyckades p fil %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s misslyckades: %s\n"
@@ -2411,7 +2383,7 @@ msgstr "felaktigt paketnummer: %s\n"
msgid "record %lu could not be read\n"
msgstr "post %u kunde inte lsas\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s r inte installerat\n"
@@ -2560,8 +2532,8 @@ msgstr "paketskript kan komma t rpm-databasen under installation."
msgid "internal support for lua scripts."
msgstr "internt std fr lua-skript."
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2572,104 +2544,74 @@ msgstr "misslyckades med att ppna %s: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "oknd tagg: \"%s\"\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "Ouppfyllda beroenden:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "Frbereder..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Frbereder paket fr installation ..."
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "Packar om..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr "Packar om raderade filer..."
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "Uppgraderar..."
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "Uppgraderar paket..."
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "Hmtar %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hoppar ver %s - verfring misslyckades - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kan inte installeras\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, c-format
msgid "package %s is not relocatable\n"
msgstr "paket %s r inte relokerbart\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "fel vid lsning frn fil %s\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, 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:577
+#: lib/rpminstall.c:539
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: inte ett rpm-paket (eller paketspecifikation): %s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kan inte ppna filen %s: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" anger flera paket\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte ppna %s: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "Installerar %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr "terstller paket (+%d/-%d) till %-24.24s (0x%08x):\n"
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr "Rensar upp ompaketerade paket:\n"
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr "\tTar bort %s:\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3020,58 +2962,6 @@ msgstr "Trasig MD5-summa: STDS EJ\n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr "Signatur: OKND (%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr "Transaktion misslyckades...rullar tillbaka\n"
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr "Kunde inte ordna automatiskt terrullad transaktion!\n"
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr "Kunde inte hmta databasinstans fr installationselement!\n"
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr "Kunde inte hmta huvud fr automatisk terrullningstransaktion!\n"
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr "\tLade till frn installationselement %s.\n"
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-"Kunde inte hmta ompaketerat huvud fr automatisk terrullningstransaktion!\n"
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-"Kunde inte lgga till raderingselement till automatiskt terrullad "
-"transaktion.\n"
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr "Misslyckades lsa ompaketerat paket!\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr "Tillggande misslyckades. Kunde inte lsa pakethuvud.\n"
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr "Tillggande misslyckades i rpmpsmStage().\n"
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr "Tillggande misslyckades. Kunde inte hmta fillista.\n"
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr "Radering misslyckades i rpmpsmStage().\n"
-
#: lib/verify.c:274
#, c-format
msgid "missing %c %s"
@@ -3222,141 +3112,141 @@ msgstr "bygg om databasens inverterade listor frn installerade pakets huvuden"
msgid "verify database files"
msgstr "verifiera databasfiler"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: oknt taggnamn: \"%s\" ignorerat\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "kan inte ppna %s-indexet med db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "kan inte ppna %s-indexet\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "ingen dbpath har satts\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "fel(%d) nr \"%s\"-poster hmtades frn %s-indexet\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: hoppar ver"
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "fel(%d) nr post nr. %d sparades i %s\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek misslyckades: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: open misslyckades: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: hoppar ver"
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: skadat huvud nr. %u hmtat -- hoppar ver.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: kan inte lsa huvud vid 0x%x\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "fel(%d) nr huvudpost nr. %d fr %s skulle tas bort\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "fel(%d) nr \"%s\"-poster frn %s-indexet sattes\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "fel(%d) nr post \"%s\" sparades i %s\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "fel(%d) nr post \"%s\" togs bort frn %s\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "fel(%d) vid allokering av ny paketinstans\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr "rpmdbAdd: hoppar ver"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "fel(%d) nr post %s sparades i %s\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "ingen dbpath har satts"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "tillfllig databas %s existerar redan\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "kunde inte ta bort katalogen %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "huvud nr. %u i databasen r felaktigt -- hoppar ver.\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kan inte lgga till post ursprungligen vid %u\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "kunde inte erstta gammal databas med ny databas!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "byt ut filer i %s med filer frn %s fr att terstlla"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunde inte ta bort katalogen %s: %s\n"
@@ -3599,6 +3489,88 @@ msgstr "%s: cacheoperation misslyckades: ec %d.\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: lsning av paketlista misslyckades: %s\n"
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr "terstllning tar en tid-/datumstmpel som argument"
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "felformaterat tid-/datumstmpelargument fr terstllning"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr "spara raderade paketfiler genom att spara dem i underkatalog"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "spara raderade paketfiler genom ompaketering"
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr "avinstallera nya, ominstallera gamla, paket tillbaka till <datum>"
+
+#~ msgid "<date>"
+#~ msgstr "<datum>"
+
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "Kan inte lsa om signaturhuvud\n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "Packar om..."
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr "Packar om raderade filer..."
+
+#~ msgid "Upgrading..."
+#~ msgstr "Uppgraderar..."
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "Uppgraderar paket..."
+
+#~ msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
+#~ msgstr "terstller paket (+%d/-%d) till %-24.24s (0x%08x):\n"
+
+#~ msgid "Cleaning up repackaged packages:\n"
+#~ msgstr "Rensar upp ompaketerade paket:\n"
+
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "\tTar bort %s:\n"
+
+#~ msgid "Transaction failed...rolling back\n"
+#~ msgstr "Transaktion misslyckades...rullar tillbaka\n"
+
+#~ msgid "Could not order auto-rollback transaction!\n"
+#~ msgstr "Kunde inte ordna automatiskt terrullad transaktion!\n"
+
+#~ msgid "Could not get install element database instance!\n"
+#~ msgstr "Kunde inte hmta databasinstans fr installationselement!\n"
+
+#~ msgid "Could not get header for auto-rollback transaction!\n"
+#~ msgstr "Kunde inte hmta huvud fr automatisk terrullningstransaktion!\n"
+
+#~ msgid "\tAdded from install element %s.\n"
+#~ msgstr "\tLade till frn installationselement %s.\n"
+
+#~ msgid "Could not get repackaged header for auto-rollback transaction!\n"
+#~ msgstr ""
+#~ "Kunde inte hmta ompaketerat huvud fr automatisk "
+#~ "terrullningstransaktion!\n"
+
+#~ msgid "Could not add erase element to auto-rollback transaction.\n"
+#~ msgstr ""
+#~ "Kunde inte lgga till raderingselement till automatiskt terrullad "
+#~ "transaktion.\n"
+
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "Misslyckades lsa ompaketerat paket!\n"
+
+#~ msgid "Add failed. Could not read package header.\n"
+#~ msgstr "Tillggande misslyckades. Kunde inte lsa pakethuvud.\n"
+
+#~ msgid "Add failed in rpmpsmStage().\n"
+#~ msgstr "Tillggande misslyckades i rpmpsmStage().\n"
+
+#~ msgid "Add failed. Could not get file list.\n"
+#~ msgstr "Tillggande misslyckades. Kunde inte hmta fillista.\n"
+
+#~ msgid "Erase failed failed in rpmpsmStage().\n"
+#~ msgstr "Radering misslyckades i rpmpsmStage().\n"
+
#, fuzzy
#~ msgid "\twaitpid(%d) rc %d status %x\n"
#~ msgstr "%s: waitpid(%d) rk %d status %x s %u.%03u\n"
diff --git a/po/tr.po b/po/tr.po
index d51834608..0f10995db 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\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"
@@ -81,170 +81,170 @@ msgstr "paketten balk okunmas srasnda hata olutu\n"
msgid "cannot re-open payload: %s\n"
msgstr "payload %s tekrar alamyor\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "Sorgulama seenekleri (-q ya da --query ile)"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "Denetleme seenekleri (-V ya da --verify ile)"
-#: rpmqv.c:85
+#: rpmqv.c:83
#, fuzzy
msgid "Source options (with --query or --verify):"
msgstr "Denetleme seenekleri (-V ya da --verify ile)"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr ""
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "mza seenekleri:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "Veritaban seenekleri:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"[ <specDosyas> | <tarPaketi> | <kaynakPaketi> ] ile paketleme seenekleri:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "Kurma/Gncelleme/Kaldrma seenekleri:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
#, fuzzy
msgid "Common options for all rpm modes and executables:"
msgstr "Tm rpm kipleri iin ortak seenekler:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "dosya %s: %s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM Srm %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, fuzzy, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "Bu program GNU GPL koullarna uygun olarak serbeste datlabilir."
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "(%d) argman ilenirken i hata olutu :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "sadece bir ana kip belirtilebilir"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "bir anda sadece bir tarz sorgulama/denetleme yaplabilir"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "beklenmeyen sorgulama bayraklar"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "beklenmeyen sorgulama biemi"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "beklenmeyen sorgulama kayna"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"sadece kaynak ve spec silme ilemleri, kurma, gncelleme ilemleri iin "
"zorlanabilir"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr ""
"dosyalar sadece paket kurulumu srasnda yeni yerlerine yerletirilebilir"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr ""
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate ve --excludepath sadece yeni paket kurulumunda kullanlabilir"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix sadece yeni paketlerin kurulmas srasnda kullanlabilir"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ile belirtilenler '/' ile balamal"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) sadece paket kurulumu srasnda kullanlabilir"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent sadece paket kurulumu srasnda kullanlabilir"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs sadece paket kurulumu srasnda kullanlabilir"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs sadece paket kurulumu srasnda kullanlabilir"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs sadece paket kurulumu srasnda kullanlabilir"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs ve --includedocs bir arada kullanlamaz"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch sadece paket kurulumu srasnda kullanlabilir"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos sadece paket kurulumu srasnda kullanlabilir"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize sadece paket kurulumu srasnda kullanlabilir"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches sadece paket kurulumu srasnda kullanlabilir"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles sadece paket kurulumu srasnda kullanlabilir"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb sadece paket kurulumu ve kaldrlmas srasnda kullanlabilir"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -252,7 +252,7 @@ msgstr ""
"betik iptal etme seenekleri sadece paketin kurulmas ve silinmesi srasnda "
"kullanlabilir"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -260,7 +260,7 @@ msgstr ""
"tetikleme iptal seenekleri sadece paketin kurulmas ve silinmesi srasnda "
"kullanlabilir"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -268,7 +268,7 @@ msgstr ""
"--nodeps sadece paket oluturma, yeniden oluturma, yeniden derleme, "
"kurulum, kaldrma ve denetleme ilemlerinde kullanlabilir"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -276,7 +276,7 @@ msgstr ""
"--test sadece paket kurulumu, kaldrlmas ve oluturulmas ilemlerinde "
"kullanlabilir"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -284,83 +284,83 @@ msgstr ""
"--root (-r) sadece kurulum, kaldrma, sorgulama ve yeniden veritaban "
"oluturma ilemlerinde kullanlabilir"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ile verilenler '/' ile balamal"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "imzalanacak dosya yok\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "%s dosyas bulunamyor\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "pgp bulunamad: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "Anahtar parolasn girin: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "Anahtar parolas kontrol baarsz\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "Anahtar parolas doru.\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Makro dosyasndaki %%_signature spec geersiz.\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign sadece paket oluturulurken kullanlabilir"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "icra baarsz\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "yeniden oluturmak iin paket dosyalar belirtilmemi"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "oluturma iin gerekli spec dosyas belirtilmemi"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "oluturma iin gereken tar dosyalar belirtilmemi"
-#: rpmqv.c:718
+#: rpmqv.c:715
#, fuzzy
msgid "no packages given for erase"
msgstr "yklenecek paket(ler) belirtilmedi"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "yklenecek paket(ler) belirtilmedi"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "sorgulama iin hi argman belirtilmedi"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "denetleme iin hi argman belirtilmedi"
-#: rpmqv.c:802
+#: rpmqv.c:792
#, fuzzy
msgid "no arguments given"
msgstr "sorgulama iin hi argman belirtilmedi"
@@ -578,7 +578,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:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Dosya glob tarafndan bulunamad: %s\n"
@@ -748,7 +748,7 @@ msgstr "%s'den balk okunamad: %s\n"
msgid "Could not open %s: %s\n"
msgstr "%s alamad: %s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "paket yazlamad: %s\n"
@@ -1287,19 +1287,19 @@ msgstr "paket bamllklarn denetlemez"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr "paket balklarn (eski) rpm[23] paketleme ile uyumlu retir"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "paket bamllklar dorulanmaz"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
#, fuzzy
msgid "don't verify database header(s) when retrieved"
msgstr "paket mimarisi denetlenmez"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
#, fuzzy
msgid "don't verify package signature(s)"
@@ -1342,7 +1342,7 @@ msgstr "(eski) rpm[23] paketleme ile uyumlu balklar retir"
msgid "Couldn't exec %s: %s\n"
msgstr "%s icra edilemedi: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "%s ayrlamad: %s\n"
@@ -1848,41 +1848,32 @@ msgstr "URL arabellek kullanm hata kontrolu"
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "dlanan dosya yolu / ile balamal"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "yeniden konumlandrma ilemleri / ile balamal"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "yeniden konumlandrma ilemleri = iermelidir"
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "yeniden konumlandrma iin = den sonra bir / gerekir"
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr ""
-
-#: lib/poptI.c:92
-#, fuzzy
-msgid "malformed rollback time/date stamp argument"
-msgstr "tekrarlama zaman bozuk"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
#, fuzzy
msgid "add suggested packages to transaction"
msgstr "gruptaki paketleri sorgular/denetler"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr "yaplandrmalarda atlanm bile olsa tm dosyalar kurar"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1890,162 +1881,156 @@ msgstr ""
"<paket> ile elenen tm paketleri kaldrr(<paket> ile ok sayda paket "
"belirtilmise normalde bir hata oluur)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "paket betikleri altrlmaz"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
#, fuzzy
msgid "relocate files in non-relocatable package"
msgstr "yeniden konumlanamayan paketin dosyalarn yeniden konumlandrr"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr ""
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr ""
-"ismi deitirilerek alt dizine kaydedilmek suretiyle silinen dosyalar "
-"kaydeder"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "paketi kaldrr"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<paket>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
#, fuzzy
msgid "do not install configuration files"
msgstr "tm yaplandrma dosyalarn listeler"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "belgeleri kurmaz"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "<dosyayolu> ile balayan dosyalar atlar "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<dosyaYolu>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
#, fuzzy
msgid "detect file conflicts between packages"
msgstr "yeniden konumlanamayan paketin dosyalarn yeniden konumlandrr"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "--replacepkgs --replacefiles iin ksaltma"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "paket(ler) kurulu ise paket(ler)i gnceller"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<paketDosyas>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "paketin kurulma srecini gsteren imler basar (-v ile)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "paket mimarisi denetlenmez"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "paketin ait olduu iletim sistemini dorulamaz"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "yklemeden nce yeterli disk alan kontrolu yapmaz"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "paket ile gelen belgeleri kurar"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
#, fuzzy
msgid "install package(s)"
msgstr "paketi kurar"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "veri tabann gnceller, ama dosya sistemini deitirmez"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "paket bamllklarn denetlemez"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "dosyalarn MD5 zmlemesi dorulanmaz"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
#, fuzzy
msgid "don't install file security contexts"
msgstr "tm yaplandrma dosyalarn listeler"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr "paket kurulum srasn bamllklara gre dzenlemez"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "%%pre betii (varsa) altrlmaz"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "%%post betii (varsa) altrlmaz"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "%%preun betii (varsa) altrlmaz"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun betii (varsa) altrlmaz"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "bu paket tarafndan tetiklenen hi bir betik altrlmaz"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "hibir %%triggerprein betii altrlmaz"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "hibir %%triggerin betii altrlmaz."
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "hibir %%triggerun betii altrlmaz."
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "hibir %%triggerpostun betii altrlmaz."
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2053,53 +2038,39 @@ msgstr ""
"paketin eski bir srme gncellenmesini salar (--force ayn ii otomatik "
"yapar)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "kurulumun geliimi yzde olarak gsterilir"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "eer deitirilebiliyorsa paketin yerini <dizin>'e deitirir"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<dizin>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "dosyalar <eski> dizininden kaldrp <yeni> dizinine yerletirir"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<eski>=<yeni>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "yeniden paketleme srasnda silinen paket dosyalarn kaydeder"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "paketi yeniden kurar"
-#: lib/poptI.c:297
-#, fuzzy
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr ""
-"yeni paket(ler) kaldrlr, geriye dnk eski paket(ler) yeniden kurulur"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<tarih>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr "ykleme yapmaz, sadece alp almayacan belirtir"
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "paket gnceller"
@@ -2333,54 +2304,49 @@ msgstr "paketi imzalar (mevcut imza kaldrlr)"
msgid "generate signature"
msgstr "imza retir"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "kaynak paketi gerekirken altrlabilir paketi bulundu\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "kaynak paketi .spec dosyas iermiyor\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s: %s betii baarsz (%d), %s-%s-%s atlanyor\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s betiinin %s-%s-%s'den icras baarsz, kta durum %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, fuzzy, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "%s betiinin %s-%s-%s'den icras baarsz, kta durum %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, fuzzy, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s: %s betii baarsz (%d), %s-%s-%s atlanyor\n"
-#: lib/psm.c:1581
-#, fuzzy
-msgid "Unable to reload signature header\n"
-msgstr "%s'den balk okunamad: %s\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "ariv paketi alrken baarsz%s%s: %s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " dosyada "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, fuzzy, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s alamad: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, fuzzy, c-format
msgid "%s failed: %s\n"
msgstr "%s baarsz\n"
@@ -2482,7 +2448,7 @@ msgstr "geersiz paket numaras: %s\n"
msgid "record %lu could not be read\n"
msgstr "%u. kayt okunamad\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "%s paketi kurulu deil\n"
@@ -2634,8 +2600,8 @@ msgstr ""
msgid "internal support for lua scripts."
msgstr "- dizgelerde desteklenmez\n"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2646,108 +2612,75 @@ msgstr "%s alamad: %s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "bilinmeyen etiket"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "bamllklarda hata; gerekli paketler:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "Hazrlanyor..."
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "Kurulacak paketler hazrlanyor..."
-#: lib/rpminstall.c:178
-#, fuzzy
-msgid "Repackaging..."
-msgstr "Hazrlanyor..."
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr ""
-
-#: lib/rpminstall.c:199
-#, fuzzy
-msgid "Upgrading..."
-msgstr "Hazrlanyor..."
-
-#: lib/rpminstall.c:201
-#, fuzzy
-msgid "Upgrading packages..."
-msgstr "paket gnceller"
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "%s alnyor\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s atlanyor - aktarm baarsz - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s yklenemedi\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, fuzzy, c-format
msgid "package %s is not relocatable\n"
msgstr "%s paketi yeniden konumlandrlamaz\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "%s dosyasndan okuma hatal\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, 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:577
+#: lib/rpminstall.c:539
#, fuzzy, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s tetikleyen paket yok\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s dosyas alamad: %s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" birden fazla paketi tanmlyor\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s alamad: %s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "%s kuruluyor\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr ""
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr ""
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, fuzzy, c-format
-msgid "\tRemoving %s:\n"
-msgstr "%s alnyor\n"
-
#: lib/rpmlead.c:100
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
@@ -3101,56 +3034,6 @@ msgstr ""
msgid "Signature: UNKNOWN (%d)\n"
msgstr "mza: boyut(%d)+iz(%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr ""
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr ""
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr ""
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr ""
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr ""
-
-#: lib/transaction.c:1260
-#, fuzzy
-msgid "Failure reading repackaged package!\n"
-msgstr "paketten balk okunmas srasnda hata olutu\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr ""
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr ""
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr ""
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr ""
-
#: lib/verify.c:274
#, fuzzy, c-format
msgid "missing %c %s"
@@ -3299,144 +3182,144 @@ msgstr "kurulu paket balklarndan veritaban listelerini yeniden oluturur"
msgid "verify database files"
msgstr "veritaban dosyaraln dorular"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: tanmlanmam etiket ad: \"%s\" yoksayld\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "%s indeksi db%d - %s (%d) kullanarak alamad\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "%s indeksi alamad\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "belirtilmi bir dbpath deeri yok\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "hata(%d): \"%s\" kayt %s indeksinden alnyor\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "hata(%d): %s kayt %s iine yazlyor\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: Fseek baarsz: %s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: alamad: %s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, fuzzy, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: bozuk balk rnei #%u alnd, atlanyor.\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%x de balk okunamad\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "hata(%d): \"%s\" kayt %s indeksinden alnyor\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "hata(%d): \"%s\" kayt %s indeksinden alnyor\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "hata(%d): %s kayt %s iine yazlyor\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "hata(%d) %s kaydn %s dosyasndan silinmesi\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "yeni paket rneini tutma hatas(%d)\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
#, fuzzy
msgid "rpmdbAdd: skipping"
msgstr "rpmdb: bozuk balk rnei #%u alnd, atlanyor.\n"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "hata(%d): %s kayt %s iine yazlyor\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "belirtilmi bir dbpath yok"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "geici veritaban %s zaten mevcut\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "%s dizininin silinmesi baarsz: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, fuzzy, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "veritabanndaki %u. kayt hatal -- atlanyor\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kayt zgn olarak %u e eklenemedi\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"veritaban yeniden oluturulamad: mevcut veritaban deimeden\n"
"yerinde brakld\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "eski veritabannn yenisiyle deitirilirmesi baarsz!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "kurtarmak iin %s iindeki dosyalar %s deki dosyalarla deitiriliyor"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "%s dizininin silinmesi baarsz: %s\n"
@@ -3681,6 +3564,50 @@ msgstr "%s: alamad: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: bildirge okuma baarsz: %s\n"
+#, fuzzy
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "tekrarlama zaman bozuk"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr ""
+#~ "ismi deitirilerek alt dizine kaydedilmek suretiyle silinen dosyalar "
+#~ "kaydeder"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "yeniden paketleme srasnda silinen paket dosyalarn kaydeder"
+
+#, fuzzy
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr ""
+#~ "yeni paket(ler) kaldrlr, geriye dnk eski paket(ler) yeniden kurulur"
+
+#~ msgid "<date>"
+#~ msgstr "<tarih>"
+
+#, fuzzy
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "%s'den balk okunamad: %s\n"
+
+#, fuzzy
+#~ msgid "Repackaging..."
+#~ msgstr "Hazrlanyor..."
+
+#, fuzzy
+#~ msgid "Upgrading..."
+#~ msgstr "Hazrlanyor..."
+
+#, fuzzy
+#~ msgid "Upgrading packages..."
+#~ msgstr "paket gnceller"
+
+#, fuzzy
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "%s alnyor\n"
+
+#, fuzzy
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "paketten balk okunmas srasnda hata olutu\n"
+
#~ msgid "========== recording tsort relations\n"
#~ msgstr "========== tsort bantlar kaydediliyor\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5b674bc24..15a2c7352 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: 2008-03-11 11:15+0200\n"
+"POT-Creation-Date: 2008-03-17 14:25+0200\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"
@@ -86,267 +86,267 @@ msgstr "讀取套件的表頭資訊時發生錯誤\n"
msgid "cannot re-open payload: %s\n"
msgstr "無法重新開啟酬載:%s\n"
-#: rpmqv.c:78
+#: rpmqv.c:76
msgid "Query options (with -q or --query):"
msgstr "查詢選項 (使用 -q 或 --query):"
-#: rpmqv.c:81
+#: rpmqv.c:79
msgid "Verify options (with -V or --verify):"
msgstr "校驗選項 (使用 -V 或 --verify):"
-#: rpmqv.c:85
+#: rpmqv.c:83
msgid "Source options (with --query or --verify):"
msgstr "原始碼選項 (使用 --query 或 --verify):"
-#: rpmqv.c:89
+#: rpmqv.c:87
msgid "File tree walk options (with --ftswalk):"
msgstr "檔案樹遍歷選項 (使用 --ftswalk):"
-#: rpmqv.c:95
+#: rpmqv.c:93
msgid "Signature options:"
msgstr "簽名選項:"
-#: rpmqv.c:101
+#: rpmqv.c:99
msgid "Database options:"
msgstr "資料庫選項:"
-#: rpmqv.c:107
+#: rpmqv.c:105
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "組建選項中使用 [ <規格檔> | <打包檔> | <原始碼套件> ]:"
-#: rpmqv.c:113
+#: rpmqv.c:111
msgid "Install/Upgrade/Erase options:"
msgstr "安裝/更新/清除選項:"
-#: rpmqv.c:120 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
+#: rpmqv.c:118 tools/rpmcache.c:528 tools/rpmdeps.c:32 tools/rpmgraph.c:255
msgid "Common options for all rpm modes and executables:"
msgstr "用於所有 rpm 模式和可執行檔案的共同選項:"
-#: rpmqv.c:135 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:31
#, c-format
msgid "%s: %s\n"
msgstr "%s:%s\n"
-#: rpmqv.c:141 lib/poptALL.c:83
+#: rpmqv.c:139 lib/poptALL.c:83
#, c-format
msgid "RPM version %s\n"
msgstr "RPM 版本 %s\n"
-#: rpmqv.c:146
+#: rpmqv.c:144
#, c-format
msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
msgstr ""
-#: rpmqv.c:147
+#: rpmqv.c:145
#, c-format
msgid ""
"This program may be freely redistributed under the terms of the GNU GPL\n"
msgstr "此程式允許在遵守 GNU GPL 協定的前提下自由散布\n"
-#: rpmqv.c:282
+#: rpmqv.c:280
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "在處理引數 (%d) 時發生內部錯誤 :-(\n"
-#: rpmqv.c:320 rpmqv.c:326 rpmqv.c:332 rpmqv.c:369
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
msgid "only one major mode may be specified"
msgstr "只能指定一個主要工作模式"
-#: rpmqv.c:348
+#: rpmqv.c:346
msgid "one type of query/verify may be performed at a time"
msgstr "只有查詢/校驗兩種工作模式能被同時選用"
-#: rpmqv.c:352
+#: rpmqv.c:350
msgid "unexpected query flags"
msgstr "不可預料的查詢旗標"
-#: rpmqv.c:355
+#: rpmqv.c:353
msgid "unexpected query format"
msgstr "不可預料的查詢格式"
-#: rpmqv.c:358
+#: rpmqv.c:356
msgid "unexpected query source"
msgstr "不可預料的查詢來源"
-#: rpmqv.c:401
+#: rpmqv.c:399
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "只有安裝、更新、移除原始碼檔案、移除規格檔案幾種作業可被強制執行"
-#: rpmqv.c:403
+#: rpmqv.c:401
msgid "files may only be relocated during package installation"
msgstr "在套件安裝時檔案可以被重新部署"
-#: rpmqv.c:406
+#: rpmqv.c:404
msgid "cannot use --prefix with --relocate or --excludepath"
msgstr "--prefix 不能和 --relocate 或 --excludepath 同時使用"
-#: rpmqv.c:409
+#: rpmqv.c:407
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate 和 --excludepath 只能在安裝新軟體時使用"
-#: rpmqv.c:412
+#: rpmqv.c:410
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix 只能在安裝新軟體時使用"
-#: rpmqv.c:415
+#: rpmqv.c:413
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix 的引數必須以「/」開頭"
-#: rpmqv.c:418
+#: rpmqv.c:416
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) 選項只能在套件安裝時指定"
-#: rpmqv.c:422
+#: rpmqv.c:420
msgid "--percent may only be specified during package installation"
msgstr "--percent 選項只能在套件安裝時指定"
-#: rpmqv.c:426
+#: rpmqv.c:424
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs 選項只能在套件安裝時指定"
-#: rpmqv.c:430
+#: rpmqv.c:428
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs 選項只能在套件安裝時指定"
-#: rpmqv.c:434
+#: rpmqv.c:432
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs 選項只能在套件安裝時指定"
-#: rpmqv.c:438
+#: rpmqv.c:436
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs 和 --includedocs 兩個選項中只能指定一個"
-#: rpmqv.c:442
+#: rpmqv.c:440
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch 選項只能在套件安裝時指定"
-#: rpmqv.c:446
+#: rpmqv.c:444
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos 選項只能在套件安裝時指定"
-#: rpmqv.c:451
+#: rpmqv.c:449
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize 選項只能在套件安裝時指定"
-#: rpmqv.c:455
+#: rpmqv.c:453
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches 選項只能在套件清除時指定"
-#: rpmqv.c:459
+#: rpmqv.c:457
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles 選項只能在套件安裝時指定"
-#: rpmqv.c:464
+#: rpmqv.c:462
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb 選項只能在套件安裝和清除時指定"
-#: rpmqv.c:469
+#: rpmqv.c:467
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "與命令稿停用有關的選項只能在套件安裝和清除時指定"
-#: rpmqv.c:474
+#: rpmqv.c:472
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "與觸發停用有關的選項只能在套件安裝和清除時指定"
-#: rpmqv.c:478
+#: rpmqv.c:476
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr "--nodeps 選項只能在套件的組建、重建、重編譯、安裝、清除和校驗時指定"
-#: rpmqv.c:483
+#: rpmqv.c:481
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test 選項只能在套件的安裝、清除和組建時指定"
-#: rpmqv.c:488
+#: rpmqv.c:486
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr "--root(-r) 選項只能在套件的安裝、清除、查詢和資料庫重建時指定"
-#: rpmqv.c:499
+#: rpmqv.c:497
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) 的引數必須以「/」開頭"
-#: rpmqv.c:525
+#: rpmqv.c:523
#, c-format
msgid "no files to sign\n"
msgstr "沒有要簽名的檔案\n"
-#: rpmqv.c:530
+#: rpmqv.c:528
#, c-format
msgid "cannot access file %s\n"
msgstr "無法存取檔案 %s\n"
-#: rpmqv.c:550
+#: rpmqv.c:548
#, c-format
msgid "pgp not found: "
msgstr "找不到 pgp: "
-#: rpmqv.c:558
+#: rpmqv.c:556
msgid "Enter pass phrase: "
msgstr "輸入密文: "
-#: rpmqv.c:560
+#: rpmqv.c:558
#, c-format
msgid "Pass phrase check failed\n"
msgstr "密文偵測失敗\n"
-#: rpmqv.c:564
+#: rpmqv.c:562
#, c-format
msgid "Pass phrase is good.\n"
msgstr "密文很好。\n"
-#: rpmqv.c:569
+#: rpmqv.c:567
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "在巨集定義檔案中有不正確的 %%_signature 規格。\n"
-#: rpmqv.c:576
+#: rpmqv.c:574
msgid "--sign may only be used during package building"
msgstr "--sign 選項只能在套件組建時指定"
-#: rpmqv.c:592
+#: rpmqv.c:590
#, c-format
msgid "exec failed\n"
msgstr "執行失敗\n"
-#: rpmqv.c:628
+#: rpmqv.c:626
msgid "no packages files given for rebuild"
msgstr "沒有指定要重建的套件名稱"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "no spec files given for build"
msgstr "沒有指定用於組建的規格檔案名稱"
-#: rpmqv.c:696
+#: rpmqv.c:694
msgid "no tar files given for build"
msgstr "沒有指定用於組建的打包檔案名稱"
-#: rpmqv.c:718
+#: rpmqv.c:715
msgid "no packages given for erase"
msgstr "沒有指定要清除的套件名稱"
-#: rpmqv.c:756
+#: rpmqv.c:749
msgid "no packages given for install"
msgstr "沒有指定要安裝的套件名稱"
-#: rpmqv.c:772
+#: rpmqv.c:762
msgid "no arguments given for query"
msgstr "沒有指定查詢引數"
-#: rpmqv.c:787
+#: rpmqv.c:777
msgid "no arguments given for verify"
msgstr "沒有指定校驗引數"
-#: rpmqv.c:802
+#: rpmqv.c:792
msgid "no arguments given"
msgstr "沒有指定引數"
@@ -563,7 +563,7 @@ msgstr "檔案需要以「/」開頭:%s\n"
msgid "Glob not permitted: %s\n"
msgstr "不容許以萬用字元解析:%s\n"
-#: build/files.c:1747 lib/rpminstall.c:310
+#: build/files.c:1747 lib/rpminstall.c:272
#, c-format
msgid "File not found by glob: %s\n"
msgstr "以萬用字元解析找不到檔案:%s\n"
@@ -732,7 +732,7 @@ msgstr "無法重載簽名表頭。\n"
msgid "Could not open %s: %s\n"
msgstr "無法開啟 %s:%s\n"
-#: build/pack.c:495 lib/psm.c:1569
+#: build/pack.c:495
#, c-format
msgid "Unable to write package: %s\n"
msgstr "無法寫入套件:%s\n"
@@ -1255,17 +1255,17 @@ msgstr "不校驗組建相依關係"
msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
msgstr "產生相容於過去的 rpm2/rpm3 打包的表頭"
-#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:214 lib/poptALL.c:220 lib/poptI.c:234 lib/poptQV.c:345
#: lib/poptQV.c:354 lib/poptQV.c:393
msgid "don't verify package digest(s)"
msgstr "不校驗套件摘要"
-#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:216 lib/poptALL.c:222 lib/poptI.c:236 lib/poptQV.c:348
#: lib/poptQV.c:356 lib/poptQV.c:396
msgid "don't verify database header(s) when retrieved"
msgstr "取回時不驗證資料庫表頭"
-#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:218 lib/poptALL.c:224 lib/poptI.c:238 lib/poptQV.c:351
#: lib/poptQV.c:358 lib/poptQV.c:398
msgid "don't verify package signature(s)"
msgstr "不校驗套件簽名"
@@ -1307,7 +1307,7 @@ msgstr "產生與(舊的) rpm[23] 包裝相容的表頭"
msgid "Couldn't exec %s: %s\n"
msgstr "無法執行 %s: %s\n"
-#: build/rpmfc.c:134 lib/psm.c:850
+#: build/rpmfc.c:134 lib/psm.c:840
#, fuzzy, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "無法開啟 %s:%s\n"
@@ -1797,244 +1797,220 @@ msgstr "對網址快取處理除錯"
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: 選項表格 misconfigured(%d)\n"
-#: lib/poptI.c:58
+#: lib/poptI.c:54
msgid "exclude paths must begin with a /"
msgstr "被排除的路徑必須以「/」開頭"
-#: lib/poptI.c:70
+#: lib/poptI.c:66
msgid "relocations must begin with a /"
msgstr "重新部署引數必須以「/」開頭"
-#: lib/poptI.c:73
+#: lib/poptI.c:69
msgid "relocations must contain a ="
msgstr "重新部署引數必須包含一個「=」"
-#: lib/poptI.c:76
+#: lib/poptI.c:72
msgid "relocations must have a / following the ="
msgstr "重新部署引數中必須有一個在「=」後的「/」"
-#: lib/poptI.c:87
-msgid "rollback takes a time/date stamp argument"
-msgstr "回捲需要時間/日期戳記引數"
-
-#: lib/poptI.c:92
-msgid "malformed rollback time/date stamp argument"
-msgstr "異常的回捲時間/日期戳記引數"
-
-#: lib/poptI.c:143
+#: lib/poptI.c:127
msgid "add suggested packages to transaction"
msgstr "加入建議的套件到異動作業"
-#: lib/poptI.c:147
+#: lib/poptI.c:131
msgid "install all files, even configurations which might otherwise be skipped"
msgstr "安裝所有檔案,即使配置檔案可能會被略過"
-#: lib/poptI.c:151
+#: lib/poptI.c:135
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
"移除所有匹配<套件>的套件 (如果<套件>被指定為多個套件,常會導致錯誤出現)"
-#: lib/poptI.c:157 lib/poptI.c:237
+#: lib/poptI.c:141 lib/poptI.c:218
msgid "do not execute package scriptlet(s)"
msgstr "不執行套件內建短命令稿"
-#: lib/poptI.c:161
+#: lib/poptI.c:145
msgid "relocate files in non-relocatable package"
msgstr "對不可重新部署的套件重新部署檔案"
-#: lib/poptI.c:165
+#: lib/poptI.c:149
msgid "print dependency loops as warning"
msgstr "印出循環的相依關係做為警告"
-#: lib/poptI.c:169
-msgid "save erased package files by renaming into sub-directory"
-msgstr "將清除的套件內的檔案重新命名後轉移到一個子目錄中"
-
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "erase (uninstall) package"
msgstr "清除(反安裝)套件"
-#: lib/poptI.c:172
+#: lib/poptI.c:153
msgid "<package>+"
msgstr "<套件>+"
-#: lib/poptI.c:175 lib/poptI.c:215
+#: lib/poptI.c:156 lib/poptI.c:196
msgid "do not install configuration files"
msgstr "不安裝配置檔案"
-#: lib/poptI.c:178 lib/poptI.c:220
+#: lib/poptI.c:159 lib/poptI.c:201
msgid "do not install documentation"
msgstr "不安裝文件"
-#: lib/poptI.c:180
+#: lib/poptI.c:161
msgid "skip files with leading component <path> "
msgstr "略過指定的 <路徑> 後的檔案 "
-#: lib/poptI.c:181
+#: lib/poptI.c:162
msgid "<path>"
msgstr "<路徑>"
-#: lib/poptI.c:185
+#: lib/poptI.c:166
msgid "detect file conflicts between packages"
msgstr "在套件之間偵測會衝突的檔案"
-#: lib/poptI.c:187
+#: lib/poptI.c:168
msgid "short hand for --replacepkgs --replacefiles"
msgstr "--replacepkgs 與 --replacefiles 的速寫"
-#: lib/poptI.c:191
+#: lib/poptI.c:172
msgid "upgrade package(s) if already installed"
msgstr "如果套件已安裝,執行更新"
-#: lib/poptI.c:192 lib/poptI.c:208 lib/poptI.c:304
+#: lib/poptI.c:173 lib/poptI.c:189 lib/poptI.c:279
msgid "<packagefile>+"
msgstr "<套件檔案>+"
-#: lib/poptI.c:194
+#: lib/poptI.c:175
msgid "print hash marks as package installs (good with -v)"
msgstr "印出出安裝套件的 Hash 碼 (常和 -v 同時使用)"
-#: lib/poptI.c:197
+#: lib/poptI.c:178
msgid "don't verify package architecture"
msgstr "不偵測套件的相容架構"
-#: lib/poptI.c:200
+#: lib/poptI.c:181
msgid "don't verify package operating system"
msgstr "不偵測套件的相容作業系統"
-#: lib/poptI.c:203
+#: lib/poptI.c:184
msgid "don't check disk space before installing"
msgstr "安裝前不偵測磁碟剩餘空間"
-#: lib/poptI.c:205
+#: lib/poptI.c:186
msgid "install documentation"
msgstr "安裝文件"
-#: lib/poptI.c:208
+#: lib/poptI.c:189
msgid "install package(s)"
msgstr "安裝套件"
-#: lib/poptI.c:211
+#: lib/poptI.c:192
msgid "update the database, but do not modify the filesystem"
msgstr "僅更新資料庫,但不對檔案系統進行修改"
-#: lib/poptI.c:217
+#: lib/poptI.c:198
msgid "do not verify package dependencies"
msgstr "不偵測套件相依性"
-#: lib/poptI.c:223 lib/poptQV.c:289 lib/poptQV.c:292
+#: lib/poptI.c:204 lib/poptQV.c:289 lib/poptQV.c:292
msgid "don't verify MD5 digest of files"
msgstr "不校驗檔案的 MD5 碼值"
-#: lib/poptI.c:225
+#: lib/poptI.c:206
msgid "don't install file security contexts"
msgstr "不安裝檔案安全上下文"
-#: lib/poptI.c:229
+#: lib/poptI.c:210
msgid "do not reorder package installation to satisfy dependencies"
msgstr "不重新排列套件安裝順序以滿足相依鏈"
-#: lib/poptI.c:234
+#: lib/poptI.c:215
msgid "do not suggest missing dependency resolution(s)"
msgstr "不給出相依性解決方案的建議"
-#: lib/poptI.c:241
+#: lib/poptI.c:222
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "不執行預先安裝短命令稿(如果存在)"
-#: lib/poptI.c:244
+#: lib/poptI.c:225
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "不執行安裝後短命令稿(如果存在)"
-#: lib/poptI.c:247
+#: lib/poptI.c:228
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "不執行預先安裝短命令稿(如果存在)"
-#: lib/poptI.c:250
+#: lib/poptI.c:231
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "不執行預先安裝短命令稿(如果存在)"
-#: lib/poptI.c:260
+#: lib/poptI.c:241
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "不執行套件內的任何可觸發短命令稿"
-#: lib/poptI.c:263
+#: lib/poptI.c:244
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "不執行任何預先作業觸發執行的短命令稿"
-#: lib/poptI.c:266
+#: lib/poptI.c:247
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "不執行任何安裝中觸發執行的短命令稿"
-#: lib/poptI.c:269
+#: lib/poptI.c:250
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "不執行任何清除中觸發執行的短命令稿"
-#: lib/poptI.c:272
+#: lib/poptI.c:253
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "不執行任何作業後觸發執行的短命令稿"
-#: lib/poptI.c:276
+#: lib/poptI.c:257
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr "更新到一個舊版本的套件 (在更新作業中 --force 指令會自動進行此步驟)"
-#: lib/poptI.c:280
+#: lib/poptI.c:261
msgid "print percentages as package installs"
msgstr "安裝套件時印出進度百分比"
-#: lib/poptI.c:282
+#: lib/poptI.c:263
msgid "relocate the package to <dir>, if relocatable"
msgstr "如果可以,把套件重新部署到 <目錄>"
-#: lib/poptI.c:283
+#: lib/poptI.c:264
msgid "<dir>"
msgstr "<目錄>"
-#: lib/poptI.c:285
+#: lib/poptI.c:266
msgid "relocate files from path <old> to <new>"
msgstr "將檔案從 <舊目錄> 重新部署到 <新目錄>"
-#: lib/poptI.c:286
+#: lib/poptI.c:267
msgid "<old>=<new>"
msgstr "<舊目錄>=<新目錄>"
-#: lib/poptI.c:289
-msgid "save erased package files by repackaging"
-msgstr "將已清除套件內的檔案另存為一個套件"
-
-#: lib/poptI.c:292
+#: lib/poptI.c:270
msgid "ignore file conflicts between packages"
msgstr "忽略套件之間的檔案衝突"
-#: lib/poptI.c:295
+#: lib/poptI.c:273
msgid "reinstall if the package is already present"
msgstr "如果套件已存在則重新安裝"
-#: lib/poptI.c:297
-msgid "deinstall new, reinstall old, package(s), back to <date>"
-msgstr "反安裝新增,重新安裝舊的套件,回到<日期>"
-
-#: lib/poptI.c:298
-msgid "<date>"
-msgstr "<日期>"
-
-#: lib/poptI.c:300
+#: lib/poptI.c:275
msgid "don't install, but tell if it would work or not"
msgstr "不真正安裝,只回報作業結果是否正確"
-#: lib/poptI.c:303
+#: lib/poptI.c:278
msgid "upgrade package(s)"
msgstr "更新套件"
@@ -2249,53 +2225,49 @@ msgstr "對套件簽名 (與 --addsign 含義相同)"
msgid "generate signature"
msgstr "產生簽名"
-#: lib/psm.c:279
+#: lib/psm.c:269
msgid "source package expected, binary found\n"
msgstr "需要一個原始碼套件,但這是一個二進位套件\n"
-#: lib/psm.c:390
+#: lib/psm.c:380
msgid "source package contains no .spec file\n"
msgstr "原始碼套件內沒有 .spec 檔案\n"
-#: lib/psm.c:864
+#: lib/psm.c:854
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s(%s-%s-%s.%s) 短命令稿執行失敗,waitpid(%d) rc %d: %s\n"
-#: lib/psm.c:873
+#: lib/psm.c:863
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
msgstr "%s(%s-%s-%s.%s) 短命令稿執行失敗,離開狀態 %d\n"
-#: lib/psm.c:879
+#: lib/psm.c:869
#, c-format
msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
msgstr "%s(%s-%s-%s.%s) 短命令稿執行失敗,離開狀態 %d\n"
-#: lib/psm.c:1489
+#: lib/psm.c:1417
#, c-format
msgid "%s: %s scriptlet failed (%d), skipping %s\n"
msgstr "%s:%s 短命令稿執行失敗 (%d),略過 %s\n"
-#: lib/psm.c:1581
-msgid "Unable to reload signature header\n"
-msgstr "無法重載簽名表頭\n"
-
-#: lib/psm.c:1656
+#: lib/psm.c:1499
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "解壓保存檔案失敗 %s%s:%s\n"
-#: lib/psm.c:1657
+#: lib/psm.c:1500
msgid " on file "
msgstr " 於檔案 "
-#: lib/psm.c:1838
+#: lib/psm.c:1631
#, c-format
msgid "%s failed on file %s: %s\n"
msgstr "%s 失敗的於檔案 %s: %s\n"
-#: lib/psm.c:1841
+#: lib/psm.c:1634
#, c-format
msgid "%s failed: %s\n"
msgstr "%s 失敗:%s\n"
@@ -2396,7 +2368,7 @@ msgstr "不正確的套件編號:%s\n"
msgid "record %lu could not be read\n"
msgstr "記錄 %u 無法讀取\n"
-#: lib/query.c:665 lib/rpminstall.c:734
+#: lib/query.c:665 lib/rpminstall.c:693
#, c-format
msgid "package %s is not installed\n"
msgstr "套件 %s 尚未安裝\n"
@@ -2545,8 +2517,8 @@ msgstr "套件內建短命令稿在安裝程序中可以存取 rpm 資料庫。"
msgid "internal support for lua scripts."
msgstr "內部支援 lua 命令稿。"
-#: lib/rpmgi.c:95 lib/rpminstall.c:97 lib/rpminstall.c:431
-#: lib/rpminstall.c:563 lib/rpmts.c:646 tools/rpmgraph.c:119
+#: lib/rpmgi.c:95 lib/rpminstall.c:96 lib/rpminstall.c:393
+#: lib/rpminstall.c:525 lib/rpmts.c:646 tools/rpmgraph.c:119
#: tools/rpmgraph.c:156
#, c-format
msgid "open of %s failed: %s\n"
@@ -2557,104 +2529,74 @@ msgstr "開啟 %s 失敗:%s\n"
msgid "unknown tag: \"%s\"\n"
msgstr "不明的標記:「%s」\n"
-#: lib/rpmgi.c:627 lib/rpminstall.c:606 lib/rpminstall.c:768
-#: lib/rpminstall.c:1014 lib/transaction.c:927 tools/rpmgraph.c:194
+#: lib/rpmgi.c:627 lib/rpminstall.c:568 lib/rpminstall.c:727
+#: tools/rpmgraph.c:194
msgid "Failed dependencies:\n"
msgstr "相依性偵測失敗:\n"
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:157
msgid "Preparing..."
msgstr "正在準備…"
-#: lib/rpminstall.c:160
+#: lib/rpminstall.c:159
msgid "Preparing packages for installation..."
msgstr "正在準備要安裝的套件…"
-#: lib/rpminstall.c:178
-msgid "Repackaging..."
-msgstr "重新打包中…"
-
-#: lib/rpminstall.c:180
-msgid "Repackaging erased files..."
-msgstr "正在重新打包被清除的檔案…"
-
-#: lib/rpminstall.c:199
-msgid "Upgrading..."
-msgstr "更新中…"
-
-#: lib/rpminstall.c:201
-msgid "Upgrading packages..."
-msgstr "正在更新套件…"
-
-#: lib/rpminstall.c:372
+#: lib/rpminstall.c:334
#, c-format
msgid "Retrieving %s\n"
msgstr "取回中 %s\n"
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:355
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "略過 %s - 傳輸失敗 - %s\n"
-#: lib/rpminstall.c:450 lib/rpminstall.c:829 tools/rpmgraph.c:139
+#: lib/rpminstall.c:412 lib/rpminstall.c:788 tools/rpmgraph.c:139
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s 無法安裝\n"
-#: lib/rpminstall.c:492
+#: lib/rpminstall.c:454
#, c-format
msgid "package %s is not relocatable\n"
msgstr "套件 %s 不能重新部署\n"
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:501
#, c-format
msgid "error reading from file %s\n"
msgstr "讀取檔案 %s 時發生錯誤\n"
-#: lib/rpminstall.c:545
+#: lib/rpminstall.c:507
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "檔案 %s 需要更新版本的 RPM\n"
-#: lib/rpminstall.c:577
+#: lib/rpminstall.c:539
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: 不是 rpm 套件(或套件清單):%s\n"
-#: lib/rpminstall.c:654
+#: lib/rpminstall.c:616
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "無法開啟檔案 %s:%s\n"
-#: lib/rpminstall.c:743
+#: lib/rpminstall.c:702
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "「%s」指定了多個套件\n"
-#: lib/rpminstall.c:813
+#: lib/rpminstall.c:772
#, c-format
msgid "cannot open %s: %s\n"
msgstr "無法開啟檔案 %s:%s\n"
-#: lib/rpminstall.c:819
+#: lib/rpminstall.c:778
#, c-format
msgid "Installing %s\n"
msgstr "正在安裝 %s\n"
-#: lib/rpminstall.c:1008 lib/transaction.c:920
-#, c-format
-msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
-msgstr "回溯套件 (+%d/-%d) to %-24.24s (0x%08x):\n"
-
-#: lib/rpminstall.c:1039 lib/transaction.c:972
-msgid "Cleaning up repackaged packages:\n"
-msgstr "正在清除重新產生的打包:\n"
-
-#: lib/rpminstall.c:1046 lib/transaction.c:979
-#, c-format
-msgid "\tRemoving %s:\n"
-msgstr "\t正在移除 %s:\n"
-
#: lib/rpmlead.c:100
#, c-format
msgid "%s: not an rpm package\n"
@@ -3003,55 +2945,6 @@ msgstr "不完整的 MD 5 摘要:不支援\n"
msgid "Signature: UNKNOWN (%d)\n"
msgstr "簽名:不明 (%d)\n"
-#: lib/transaction.c:918
-msgid "Transaction failed...rolling back\n"
-msgstr "異動作業失敗…返回\n"
-
-#: lib/transaction.c:938
-msgid "Could not order auto-rollback transaction!\n"
-msgstr "無法排列自動返回異動作業的順序!\n"
-
-#: lib/transaction.c:1165
-msgid "Could not get install element database instance!\n"
-msgstr "無法取得安裝元件資料庫實體!\n"
-
-#: lib/transaction.c:1178
-msgid "Could not get header for auto-rollback transaction!\n"
-msgstr "無法取得表頭用於自動返回異動作業!\n"
-
-#: lib/transaction.c:1201
-#, c-format
-msgid "\tAdded from install element %s.\n"
-msgstr "\t已從安裝元件 %s 加入。\n"
-
-#: lib/transaction.c:1208
-msgid "Could not get repackaged header for auto-rollback transaction!\n"
-msgstr "無法取得重新包裝的表頭用於自動返回異動作業!\n"
-
-#: lib/transaction.c:1248
-msgid "Could not add erase element to auto-rollback transaction.\n"
-msgstr "無法加入清除元件到自動返回異動作業。\n"
-
-#: lib/transaction.c:1260
-msgid "Failure reading repackaged package!\n"
-msgstr "讀取重新包裝的套件時失敗!\n"
-
-#: lib/transaction.c:1957
-msgid "Add failed. Could not read package header.\n"
-msgstr "加入失敗。無法讀取套件表頭。\n"
-
-#: lib/transaction.c:2039
-msgid "Add failed in rpmpsmStage().\n"
-msgstr "加入 rpmpsmStage() 中失敗。\n"
-
-#: lib/transaction.c:2082
-msgid "Add failed. Could not get file list.\n"
-msgstr "加入失敗。無法取得檔案清單。\n"
-
-#: lib/transaction.c:2128
-msgid "Erase failed failed in rpmpsmStage().\n"
-msgstr "清除 rpmpsmStage() 中檔案失敗。\n"
-
#: lib/verify.c:274
#, c-format
msgid "missing %c %s"
@@ -3200,141 +3093,141 @@ msgstr "從安裝的套件表頭重建資料庫的反相清單"
msgid "verify database files"
msgstr "驗證資料庫檔案"
-#: rpmdb/rpmdb.c:180
+#: rpmdb/rpmdb.c:186
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit:無法辨識的標記名稱:\"%s\"忽略\n"
-#: rpmdb/rpmdb.c:243
+#: rpmdb/rpmdb.c:258
#, c-format
msgid "dbiOpen: dbapi %d not available\n"
msgstr ""
-#: rpmdb/rpmdb.c:253
+#: rpmdb/rpmdb.c:268
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "無法使用資料庫 %2$d- %3$s(%4$d) 開啟 %1$s 索引\n"
-#: rpmdb/rpmdb.c:273
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index\n"
msgstr "無法開啟 %s 索引\n"
-#: rpmdb/rpmdb.c:909
+#: rpmdb/rpmdb.c:926
msgid "no dbpath has been set\n"
msgstr "沒有 dbpath 已被設定\n"
-#: rpmdb/rpmdb.c:1146 rpmdb/rpmdb.c:1271 rpmdb/rpmdb.c:1321 rpmdb/rpmdb.c:2225
-#: rpmdb/rpmdb.c:2344 rpmdb/rpmdb.c:3039
+#: rpmdb/rpmdb.c:1159 rpmdb/rpmdb.c:1284 rpmdb/rpmdb.c:1334 rpmdb/rpmdb.c:2238
+#: rpmdb/rpmdb.c:2357 rpmdb/rpmdb.c:3043
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "從 %3$s 索引取得 \"%2$s\" 記錄時產生錯誤(%1$d)\n"
-#: rpmdb/rpmdb.c:1496
+#: rpmdb/rpmdb.c:1509
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader:跳過"
-#: rpmdb/rpmdb.c:1506
+#: rpmdb/rpmdb.c:1519
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "儲存記錄 #%2$d 進入 %3$s 時產生錯誤(%1$d)\n"
-#: rpmdb/rpmdb.c:1606
+#: rpmdb/rpmdb.c:1619
#, fuzzy, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s:檢索失敗:%s\n"
-#: rpmdb/rpmdb.c:1787
+#: rpmdb/rpmdb.c:1800
#, fuzzy, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s:開啟失敗:%s\n"
-#: rpmdb/rpmdb.c:2122
+#: rpmdb/rpmdb.c:2135
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator:跳過"
-#: rpmdb/rpmdb.c:2151
+#: rpmdb/rpmdb.c:2164
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb:已取回損壞的表頭 #%u -- 跳過。\n"
-#: rpmdb/rpmdb.c:2445
+#: rpmdb/rpmdb.c:2458
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 無法讀取在 0x%x 的表頭\n"
-#: rpmdb/rpmdb.c:2503
+#: rpmdb/rpmdb.c:2516
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "設定用於 %3$s 撤除的表頭 #%2$d 記錄時產生錯誤(%1$d)\n"
-#: rpmdb/rpmdb.c:2634
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "從 %3$s 索引設定 \"%2$s\" 記錄時產生錯誤(%1$d)\n"
-#: rpmdb/rpmdb.c:2653
+#: rpmdb/rpmdb.c:2666
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "儲存記錄 \"%2$s\" 進入 %3$s 時產生錯誤(%1$d)\n"
-#: rpmdb/rpmdb.c:2663
+#: rpmdb/rpmdb.c:2676
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "從 %3$s 移除記錄 \"%2$s\" 時產生錯誤(%1$d)\n"
-#: rpmdb/rpmdb.c:2810
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "配置新套件實體時產生錯誤(%d)\n"
-#: rpmdb/rpmdb.c:2866
+#: rpmdb/rpmdb.c:2870
msgid "rpmdbAdd: skipping"
msgstr "rpmdbAdd:跳過"
-#: rpmdb/rpmdb.c:3055
+#: rpmdb/rpmdb.c:3059
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "儲存記錄 %2$s 於 %3$s 時產生錯誤(%1$d)\n"
-#: rpmdb/rpmdb.c:3442
+#: rpmdb/rpmdb.c:3446
msgid "no dbpath has been set"
msgstr "沒有 dbpath 已被設定"
-#: rpmdb/rpmdb.c:3472
+#: rpmdb/rpmdb.c:3476
#, c-format
msgid "temporary database %s already exists\n"
msgstr "臨時資料庫 %s 已經存在\n"
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3484
#, fuzzy, c-format
msgid "failed to create directory %s: %s\n"
msgstr "移除目錄時失敗 %s: %s\n"
-#: rpmdb/rpmdb.c:3527
+#: rpmdb/rpmdb.c:3531
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "在資料庫中有不當的表頭 #%u -- 跳過。\n"
-#: rpmdb/rpmdb.c:3565
+#: rpmdb/rpmdb.c:3569
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "無法加入原本在 %u 的記錄\n"
-#: rpmdb/rpmdb.c:3579
+#: rpmdb/rpmdb.c:3583
msgid "failed to rebuild database: original database remains in place\n"
msgstr "重建資料庫時失敗:原來的資料庫保持原狀\n"
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3591
msgid "failed to replace old database with new database!\n"
msgstr "以新的資料庫取代舊的資料庫時失敗!\n"
-#: rpmdb/rpmdb.c:3589
+#: rpmdb/rpmdb.c:3593
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "以 %2$s 的檔案取代 %1$s 中的檔案來回復"
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "移除目錄時失敗 %s: %s\n"
@@ -3577,6 +3470,84 @@ msgstr "%s: 快取作業失敗:ec %d。\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: 讀取清單失敗:%s\n"
+#~ msgid "rollback takes a time/date stamp argument"
+#~ msgstr "回捲需要時間/日期戳記引數"
+
+#~ msgid "malformed rollback time/date stamp argument"
+#~ msgstr "異常的回捲時間/日期戳記引數"
+
+#~ msgid "save erased package files by renaming into sub-directory"
+#~ msgstr "將清除的套件內的檔案重新命名後轉移到一個子目錄中"
+
+#~ msgid "save erased package files by repackaging"
+#~ msgstr "將已清除套件內的檔案另存為一個套件"
+
+#~ msgid "deinstall new, reinstall old, package(s), back to <date>"
+#~ msgstr "反安裝新增,重新安裝舊的套件,回到<日期>"
+
+#~ msgid "<date>"
+#~ msgstr "<日期>"
+
+#~ msgid "Unable to reload signature header\n"
+#~ msgstr "無法重載簽名表頭\n"
+
+#~ msgid "Repackaging..."
+#~ msgstr "重新打包中…"
+
+#~ msgid "Repackaging erased files..."
+#~ msgstr "正在重新打包被清除的檔案…"
+
+#~ msgid "Upgrading..."
+#~ msgstr "更新中…"
+
+#~ msgid "Upgrading packages..."
+#~ msgstr "正在更新套件…"
+
+#~ msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
+#~ msgstr "回溯套件 (+%d/-%d) to %-24.24s (0x%08x):\n"
+
+#~ msgid "Cleaning up repackaged packages:\n"
+#~ msgstr "正在清除重新產生的打包:\n"
+
+#~ msgid "\tRemoving %s:\n"
+#~ msgstr "\t正在移除 %s:\n"
+
+#~ msgid "Transaction failed...rolling back\n"
+#~ msgstr "異動作業失敗…返回\n"
+
+#~ msgid "Could not order auto-rollback transaction!\n"
+#~ msgstr "無法排列自動返回異動作業的順序!\n"
+
+#~ msgid "Could not get install element database instance!\n"
+#~ msgstr "無法取得安裝元件資料庫實體!\n"
+
+#~ msgid "Could not get header for auto-rollback transaction!\n"
+#~ msgstr "無法取得表頭用於自動返回異動作業!\n"
+
+#~ msgid "\tAdded from install element %s.\n"
+#~ msgstr "\t已從安裝元件 %s 加入。\n"
+
+#~ msgid "Could not get repackaged header for auto-rollback transaction!\n"
+#~ msgstr "無法取得重新包裝的表頭用於自動返回異動作業!\n"
+
+#~ msgid "Could not add erase element to auto-rollback transaction.\n"
+#~ msgstr "無法加入清除元件到自動返回異動作業。\n"
+
+#~ msgid "Failure reading repackaged package!\n"
+#~ msgstr "讀取重新包裝的套件時失敗!\n"
+
+#~ msgid "Add failed. Could not read package header.\n"
+#~ msgstr "加入失敗。無法讀取套件表頭。\n"
+
+#~ msgid "Add failed in rpmpsmStage().\n"
+#~ msgstr "加入 rpmpsmStage() 中失敗。\n"
+
+#~ msgid "Add failed. Could not get file list.\n"
+#~ msgstr "加入失敗。無法取得檔案清單。\n"
+
+#~ msgid "Erase failed failed in rpmpsmStage().\n"
+#~ msgstr "清除 rpmpsmStage() 中檔案失敗。\n"
+
#, fuzzy
#~ msgid "\twaitpid(%d) rc %d status %x\n"
#~ msgstr "%s: waitpid(%d) rc %d 狀況 %x 秒 %u.%03u\n"