summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-02-01 15:19:44 +0000
committerjbj <devnull@localhost>2002-02-01 15:19:44 +0000
commitff7a19b2bd00ef66ee702136f2365fae8f713966 (patch)
tree6e6226ad92732d5051e24d2bf3fad5ba73739bc5 /po
parentd52d65e9f2d9087b9db306315c217d52e085a77f (diff)
downloadlibrpm-tizen-ff7a19b2bd00ef66ee702136f2365fae8f713966.tar.gz
librpm-tizen-ff7a19b2bd00ef66ee702136f2365fae8f713966.tar.bz2
librpm-tizen-ff7a19b2bd00ef66ee702136f2365fae8f713966.zip
- permit args to be hidden within %%__find_{requires,provides}.
- a couple more perl.{prov,req} fiddles. CVS patchset: 5289 CVS date: 2002/02/01 15:19:44
Diffstat (limited to 'po')
-rw-r--r--po/cs.po197
-rw-r--r--po/da.po195
-rw-r--r--po/de.po199
-rw-r--r--po/en_RN.po186
-rw-r--r--po/es.po186
-rw-r--r--po/eu_ES.po186
-rw-r--r--po/fi.po199
-rw-r--r--po/fr.po198
-rw-r--r--po/gl.po186
-rw-r--r--po/hu.po186
-rw-r--r--po/id.po186
-rw-r--r--po/is.po186
-rw-r--r--po/it.po186
-rw-r--r--po/ja.po195
-rw-r--r--po/ko.po197
-rw-r--r--po/no.po195
-rw-r--r--po/pl.po195
-rw-r--r--po/pt.po195
-rw-r--r--po/pt_BR.po199
-rw-r--r--po/ro.po186
-rw-r--r--po/rpm.pot8
-rw-r--r--po/ru.po197
-rw-r--r--po/sk.po195
-rw-r--r--po/sl.po197
-rw-r--r--po/sr.po199
-rw-r--r--po/sv.po197
-rw-r--r--po/tr.po197
-rw-r--r--po/uk.po186
-rw-r--r--po/wa.po186
-rw-r--r--po/zh.po186
-rw-r--r--po/zh_CN.GB2312.po186
31 files changed, 3099 insertions, 2673 deletions
diff --git a/po/cs.po b/po/cs.po
index 54e86df67..dd90dcad3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\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"
@@ -113,7 +113,7 @@ msgstr "<přík>"
msgid "use <dir> as the top level directory"
msgstr "použít <adr> jako adresář nejvyšší úrovně"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr "<adresář>"
@@ -412,8 +412,9 @@ msgid "no tar files given for build"
msgstr "pro sestavení nezadány žádné tar soubory"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "nezadány žádné balíčky pro odstranění"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "k podepsání nezadány žádné balíčky"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -677,17 +678,17 @@ msgstr "%s selhalo\n"
msgid "failed to write all data to %s\n"
msgstr "Nemohu zapsat všechna data do %s\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr "Hledám %s: (použit %s)...\n"
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr "Selhalo vyhledání %s:\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "Zpracovávám soubory: %s-%s-%s\n"
@@ -1483,18 +1484,23 @@ msgstr "NE "
msgid "YES"
msgstr "ANO"
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "odstraňuji %s-%s-%s \"%s\" z tsort relací.\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr "========== ukládání tsort relací\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1502,20 +1508,20 @@ msgid ""
msgstr ""
"========== tsorting balíčků (pořadí, #předchůdce, #následovník, hloubka)\n"
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr "========== pouze úspěšné (pořadí dle prezentace)\n"
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr "SMYČKA:\n"
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr "========== pokračuje tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1653,32 +1659,37 @@ msgstr "%s: readLead selhalo\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr "vynechané cesty musí začínat znakem /"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "přemístění musejí začínat znakem /"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "přemístění musejí obsahovat ="
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "přemístění musejí mít za znakem = znak /"
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+#, fuzzy
+msgid "malformed rollback time/date stamp argument"
msgstr "porušený rollback čas"
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"nainstalovat všechny soubory i konfigurace, které by se jinak mohly vynechat"
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1686,131 +1697,131 @@ msgstr ""
"odstranit všechny balíčky odpovídající <balíčku> (obvykle se generuje chyba, "
"specifikuje-li <balíček> více balíčků)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr "nespouštět žádné skripty určené pro balíčky"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr "přemístění souborů v nepřemístitelném balíčku"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr "uchovat smazané soubory přesunem do podadresáře"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "smazat (deinstalovat) balíček"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr "<balíček>"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "neinstalovat dokumentaci"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr "přeskočit soubory s úvodní cestou <cesta> "
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr "<cesta>"
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "zkratka pro --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr "aktualizace balíčku jestliže je již nainstalován"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr "<soubor_balíčku>+"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "během instalace balíčku zobrazit dvojité křížky (dobré s -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "nekontrolovat architekturu balíčku"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "nekontrolovat operační systém balíčku"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "nekontrolovat volné místo na disku před instalací"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "nainstalovat dokumentaci"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "nainstalovat balíček"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "upravit databázi, ale neupravovat systém souborovů"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "nekontrolovat závislosti balíčků"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr "pro vyřešení závislostí neměnit pořadí instalace balíčků"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "nespouštět žádné skripty (jsou-li nějaké)"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "nespouštět žádné skripty (jsou-li nějaké)"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "nespouštět žádné skripty (jsou-li nějaké)"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nespouštět žádné skripty (jsou-li nějaké)"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nespouštět žádné skripty aktivované tímto balíčkem"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nespouštět žádné skripty určené pro balíčky"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nespouštět žádné instalační skripty"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nespouštět žádné instalační skripty"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nespouštět žádné instalační skripty"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1818,47 +1829,48 @@ msgstr ""
"aktualizovat na starou verzi balíčku (--force to dělá při aktualizacích "
"automaticky)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "během instalace balíčku zobrazit procenta"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "přemístit soubory do <adr>, jsou-li přemístitelné"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr "přemístit soubory ze <staré_cesty> do <nové_cesty>"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr "<stará_cesta>=<nová_cesta>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr "uchovat smazané soubory pomocí přebalení"
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "instalovat, i když balíček přepíše existující soubory"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "přeinstalovat, i když je již balíček přítomen"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+#, fuzzy
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr "odinstalovat nové balíčky, reinstalovat staré balíčky zpět do data"
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr "<datum>"
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr "neinstalovat ale sdělit, zda-li by to fungovalo či nikoli"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr "aktualizace balíčku"
@@ -2474,7 +2486,7 @@ msgstr "%s nemůže být nainstalován\n"
msgid "found %d source and %d binary packages\n"
msgstr "nalezeno %d zdrojových a %d binárních balíčků\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "nevyřešené závislosti:\n"
@@ -2506,6 +2518,11 @@ msgstr "nemohu otevřít %s: %s\n"
msgid "Installing %s\n"
msgstr "Instaluji %s\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -3062,110 +3079,110 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "chyba(%d) při počítání balíčků\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "záznam číslo %d v databázi je chybný -- vynechávám.\n"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: porušená položka hlavičky #%u, přeskakuji.\n"
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: nemohu číst hlavičku na adrese 0x%x\n"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraňuji \"%s\" z indexu %s.\n"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "odstraňuji %d položek z indexu %s.\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "chyba(%d) při alokaci nové instance balíčku\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "přidávám \"%s\" do indexu %s\n"
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "přidávám %d položek do indexu %s.\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "odstraňuji %s po úspěšném znovusestavení db3.\n"
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "nebyla nastavena dbpath"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "databázi %s převádím do %s\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr "dočasná databáze %s již existuje\n"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr "vytvářím adresář %s\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr "vytvářím adresář %s: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otevírám starou databázi s dbapi %d\n"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otevírám novou databázi s dbapi %d\n"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "nemohu přidat záznam - původně u %d\n"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"databázi nelze zvovu vytvořit; původní databáze zůstává na svém místě\n"
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr "starou databázi nelze nahradit novou databází!\n"
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "pro obnovení nahraďte soubory v %s soubory z %s"
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr "mažu adresář %s\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "nemohu odstranit adresář %s: %s\n"
@@ -3377,6 +3394,9 @@ msgstr "url port musí být číslo\n"
msgid "failed to create %s: %s\n"
msgstr "nemohu vytvořit %s: %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "nezadány žádné balíčky pro odstranění"
+
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "Nemohu spustit pgp (%s)\n"
@@ -3466,9 +3486,6 @@ msgstr "nemohu vytvořit %s: %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "ke kontrole podpisu nezadány žádné balíčky"
-#~ msgid "no packages given for signing"
-#~ msgstr "k podepsání nezadány žádné balíčky"
-
#~ msgid "rpm: %s\n"
#~ msgstr "rpm: %s\n"
diff --git a/po/da.po b/po/da.po
index ee9ecce70..9d4707df1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\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"
@@ -114,7 +114,7 @@ msgstr "<kmd>"
msgid "use <dir> as the top level directory"
msgstr "brug <katalog> som topniveau-katalog"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr "<katalog>"
@@ -407,8 +407,9 @@ msgid "no tar files given for build"
msgstr "ingen tar-arkiver angivet til opbygning"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "ingen pakker angivet ved afinstallation"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "ingen pakker angivet ved signering"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -672,17 +673,17 @@ msgstr "%s mislykkedes\n"
msgid "failed to write all data to %s\n"
msgstr "kunne ikke skrive alle data til %s\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr "Finder %s: (benytter %s)...\n"
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr "Kunne ikke finde %s:\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "Gennemlřber filer: %s-%s-%s\n"
@@ -1485,37 +1486,42 @@ msgstr "IKKE O.K."
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr "========== gemmer tsort-relationer\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr "========== kun efterfřlgere (prćsentationsrćkkefřlge)\n"
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr "LŘKKE:\n"
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr "========== fortsćtter tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1653,33 +1659,37 @@ msgstr "%s: readLead mislykkedes\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr "udeladte stier skal begynde med et /"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "omrokeringer skal starte med et /"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "omrokeringer skal indeholde et ="
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "i omrokeringer skal = efterfřlges af /"
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"installér alle filer -- ogsĺ konfigurationsfiler, der ellers skulle "
"overspringes"
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1687,136 +1697,136 @@ msgstr ""
"fjern alle pakker, som passer med <pakke> (normalt ville det medfřre en "
"fejl, hvis <pakke> angav flere pakker)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "udfřr ingen pakkespecifikke skripter"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr "omdirigér filer i ikke-omdirigérbar pakke"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "slet (afinstallér) pakke"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
#, fuzzy
msgid "<package>+"
msgstr "<pakke>"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "installér ikke dokumentation"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr "overspring filer med foranstillet komponent <sti> "
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "forkortelse for --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "opgradér pakke, hvis den allerede er installeret"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr "<pakkefil>+"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "udlćs #'er efterhĺnden som pakken installeres (virker sammen med -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "tjek ikke pakkens arkitektur"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "tjek ikke pakkens operativsystem"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "tjek ikke om der er diskplads, fřr der installeres"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "installér dokumentation"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "installér pakke"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "opdatér databasen, men rřr ikke filsystemet"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "undlad at tjekke pakkers afhćngighedskrav"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"ćndr ikke pakkernes installationsrćkkefřlge for at opfylde afhćngigheder"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "udfřr ikke eventuelle skripter"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "udfřr ikke eventuelle skripter"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "udfřr ikke eventuelle skripter"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "udfřr ikke eventuelle skripter"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "udfřr ikke smĺskripter, der mĺtte udlřses af denne pakke"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "udfřr ingen pakkespecifikke skripter"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "udfřr ingen installations-smĺskripter"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "udfřr ingen installations-smĺskripter"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "udfřr ingen installations-smĺskripter"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1824,49 +1834,49 @@ msgstr ""
"opgradér til en ćldre version af pakken (--force gřr ikke dette automatisk "
"ved opgraderinger)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "vis procenter efterhĺnden som pakken installeres"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "omdirigér pakken til <katalog>, hvis omdirigérbar"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "omdirigér filer fra <gammelsti> til <nysti>"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
#, fuzzy
msgid "<old>=<new>"
msgstr "<gammelsti>=<nysti>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "intallér selvom pakken erstatter installerede filer"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "geninstallér hvis pakken allerede er installeret"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr "installér ikke, men fortćl om det ville lykkes eller ej"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
#, fuzzy
msgid "upgrade package(s)"
msgstr "opgradér pakke"
@@ -2494,7 +2504,7 @@ msgstr "%s kunne ikke installeres\n"
msgid "found %d source and %d binary packages\n"
msgstr "fandt %d kilde- og %d binćrpakker\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "afhćngighedskrav, der ikke kunne imřdekommes:\n"
@@ -2526,6 +2536,11 @@ msgstr "kunne ikke ĺbne %s: %s\n"
msgid "Installing %s\n"
msgstr "Installerer %s\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -3087,113 +3102,113 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "fejl(%d) ved optćlling af pakker\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "post nummer %d i databasen er fejlbehćftet -- overspringer.\n"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: kan ikke lćse hoved ved 0x%x\n"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "fjerner \"%s\" fra %s-indekset.\n"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "fjerne %d indgange fra %s-indekset.\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "fejl(%d) under allokering af ny pakkeinstans\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
"tilfřjer \"%s\" til '%s'-indekset.\n"
"\n"
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "tilfřjer %d indgange til '%s'-indekset.\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "fjerner %s efter vellykket genopbygning af db3.\n"
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "der ikke sat nogen dbpath"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "genopbygger database %s over i %s\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr "den midlertidige database %s eksisterer allerede\n"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
"opretter kataloget %s\n"
"\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr "opretter kataloget %s: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "ĺbner gammel database med dbapi %d\n"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "ĺbner ny database med dbapi %d\n"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "kunne ikke tilfřje posten, der tidligere var ved %d\n"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr "kunne ikke erstatte gammel database med ny database!\n"
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, 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:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr "fjerner kataloget %s\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunne ikke fjerne katalog %s: %s\n"
@@ -3405,6 +3420,9 @@ msgstr "url-port skal vćre et tal\n"
msgid "failed to create %s: %s\n"
msgstr "kunne ikke oprette %s: %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "ingen pakker angivet ved afinstallation"
+
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "Kunne ikke křre pgp (%s)\n"
@@ -3494,9 +3512,6 @@ msgstr "kunne ikke oprette %s: %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "ingen pakker angivet ved signatur-tjek"
-#~ msgid "no packages given for signing"
-#~ msgstr "ingen pakker angivet ved signering"
-
#~ msgid "rpm: %s\n"
#~ msgstr "rpm %s\n"
diff --git a/po/de.po b/po/de.po
index 985793037..9edc4b188 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: 1998-08-03 18:02+02:00\n"
"Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
"Language-Team: German <de@li.org>\n"
@@ -157,7 +157,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "<VERZ> als Stammverzeichnis benutzen"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -474,8 +474,9 @@ msgid "no tar files given for build"
msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "Es wurden keine Pakete für die Signatur angeben"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -755,19 +756,19 @@ msgstr "pgp fehlgeschlagen"
msgid "failed to write all data to %s\n"
msgstr "anlegen von %s fehlgeschlagen\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
# , c-format
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, fuzzy, c-format
msgid "Failed to find %s:\n"
msgstr "anlegen von %s fehlgeschlagen\n"
# , c-format
-#: build/files.c:2626
+#: build/files.c:2650
#, fuzzy, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -1620,38 +1621,43 @@ msgstr ""
msgid "YES"
msgstr ""
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
# FIXME
-#: lib/depends.c:1033
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1796,34 +1802,38 @@ msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "Verschiebungen müssen ein ť=Ť beinhalten"
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "bei Verschiebungen muss ein ť/Ť dem ť=Ť folgen"
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"alle Dateien installieren, auch die config-Dateien, die sonst übergangen "
"würden"
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1831,138 +1841,138 @@ msgstr ""
"Alle Pakete entfernen, die mit <PAKET> übereinstimmen (normalerweise wird "
"ein Fehler angezeigt, wenn <PAKET> mehrere Pakete bezeichnet)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "Keine paketspezifischen Skripte ausführen"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "Paket löschen (deinstallieren)"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
#, fuzzy
msgid "<package>+"
msgstr "Anfrage an alle Pakete"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "Dokumentation nicht installieren"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "Abkürzung für --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<STUFE> <SPEC> "
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "Fortschrittsanzeige bei der Paketinstallation (gut zusammen mit -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "Paket-Architektur nicht überprüfen"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "Paket-Betriebssystem nicht überprüfen"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "Dokumentation installieren"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "Paket installieren"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "Datenbank erneuern, aber das Dateisystem nicht verändern"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "Dateiabhängigkeiten nicht überprüfen"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"Paket-Installation nicht neu sortieren, um den Abhängigkeiten zu genügen"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "Keine Stufen ausführen"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "Keine Stufen ausführen"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "Keine Stufen ausführen"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "Keine Stufen ausführen"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "Keine paketspezifischen Skripte ausführen"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "Keine Installations-Skripte ausführen"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "Keine Installations-Skripte ausführen"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "Keine Installations-Skripte ausführen"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1970,50 +1980,50 @@ msgstr ""
"Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
"Aktualisierungen automatisch)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "Prozentangabe bei der Paketinstallation ausgeben"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis <VERZ>"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
#, fuzzy
msgid "<old>=<new>"
msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "Neuinstallation, wenn das Paket schon vorhanden ist"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
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:220
+#: lib/poptI.c:230
#, fuzzy
msgid "upgrade package(s)"
msgstr "Paket installieren"
@@ -2672,7 +2682,7 @@ msgstr "Fehler: %s kann nicht installiert werden\n"
msgid "found %d source and %d binary packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
@@ -2706,6 +2716,11 @@ msgstr "Fehler: kann %s nicht öffnen\n"
msgid "Installing %s\n"
msgstr "Installiere %s\n"
+#: lib/rpminstall.c:1022
+#, fuzzy, c-format
+msgid "rollback %d packages to %s"
+msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
+
#: lib/rpmlead.c:50
#, fuzzy, c-format
msgid "read failed: %s (%d)\n"
@@ -3272,114 +3287,114 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "Fehler beim Suchen nach Paket %s\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
"Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
# FIXME
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
# FIXME
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "Fehler beim Suchen nach Paket %s\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
# FIXME
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "ťdbpathŤ ist nicht gesetzt"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "die temporäre Datenbank %s existiert schon"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
# , c-format
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -3604,6 +3619,9 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
msgid "failed to create %s: %s\n"
msgstr "anlegen von %s fehlgeschlagen\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
+
#, fuzzy
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "Konnte pgp nicht durchführen"
@@ -3697,9 +3715,6 @@ msgstr "anlegen von %s fehlgeschlagen\n"
#~ msgid "no packages given for signature check"
#~ msgstr "Es wurden keine Pakete für die Signaturüberprüfung angegeben"
-#~ msgid "no packages given for signing"
-#~ msgstr "Es wurden keine Pakete für die Signatur angeben"
-
#, fuzzy
#~ msgid "Usage: rpm {--help}"
#~ msgstr "Benutzung: rpm {--help}"
@@ -4926,10 +4941,6 @@ msgstr "anlegen von %s fehlgeschlagen\n"
#~ msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
#, fuzzy
-#~ msgid "found %d packages to uninstall\n"
-#~ msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
-
-#, fuzzy
#~ msgid "error %d reading header: %s\n"
#~ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
diff --git a/po/en_RN.po b/po/en_RN.po
index ef1c7146c..13e2cae7c 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -405,7 +405,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -666,17 +666,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1456,37 +1456,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1621,207 +1626,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2422,7 +2431,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2454,6 +2463,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2997,109 +3011,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/es.po b/po/es.po
index ef1c7146c..13e2cae7c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -405,7 +405,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -666,17 +666,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1456,37 +1456,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1621,207 +1626,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2422,7 +2431,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2454,6 +2463,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2997,109 +3011,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index ef1c7146c..13e2cae7c 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -405,7 +405,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -666,17 +666,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1456,37 +1456,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1621,207 +1626,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2422,7 +2431,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2454,6 +2463,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2997,109 +3011,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 545670ba4..7379412f0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -114,7 +114,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "käytä <hakem> ylimpänä hakemistona"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -422,8 +422,9 @@ msgid "no tar files given for build"
msgstr "käännökselle ei määritelty tar-tiedostoja"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "poistolle ei määritelty paketteja"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "allekirjoitukselle ei määritelty paketteja"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -690,17 +691,17 @@ msgstr "pgp epäonnistui"
msgid "failed to write all data to %s\n"
msgstr "%s:n luonti epäonnistui\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, fuzzy, c-format
msgid "Failed to find %s:\n"
msgstr "%s:n luonti epäonnistui\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, fuzzy, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "en voinut avata %s: %s"
@@ -1511,37 +1512,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1682,33 +1688,37 @@ msgstr "%s: readLead epäonnistui\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "siirtojen pitää alkaa /-merkillä"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "siirtojen pitää alkaa /-merkillä"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "siirroissa pitää olla =-merkki"
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "siirroissa pitää olla / =-merkin jälkeen"
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:110
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:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1716,137 +1726,137 @@ msgstr ""
"poista kaikki paketit, joiden nimeä vastaa <paketti> (tavallisesti, jos "
"<paketti> määrittää useita paketteja, tulee virhe)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "älä aja mitään pakettikohtaisia skriptejä"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "poista paketti"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
#, fuzzy
msgid "<package>+"
msgstr "kysele kaikki paketit"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "älä asenna dokumentointia"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "lyhenne parametreille --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<vaihe> <määrittely> "
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "tulosta risuaitaa paketin asentuessa (-v:n kanssa hyvä)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "älä tarkista paketin arkkitehtuuria"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "älä tarkista paketin käyttöjärjestelmää"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "asenna dokumentaatio"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "asenna paketti"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "älä tarkista paketin riippuvuuksia"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "älä suorita mitään vaiheita"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "älä suorita mitään vaiheita"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "älä suorita mitään vaiheita"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "älä suorita mitään vaiheita"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "älä aja mitään pakettikohtaisia skriptejä"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "älä suorita asennusskriptejä"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "älä suorita asennusskriptejä"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "älä suorita asennusskriptejä"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1854,49 +1864,49 @@ msgstr ""
"päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
"automaattisesti)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "tulosta asennuksen eteneminen prosentteina"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
#, fuzzy
msgid "<old>=<new>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "asenna uudelleen, jos paketti on jo asennettu"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr "älä asenna, mutta kerro onnistuisiko se"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
#, fuzzy
msgid "upgrade package(s)"
msgstr "asenna paketti"
@@ -2545,7 +2555,7 @@ msgstr "virhe: %s ei voida asentaa\n"
msgid "found %d source and %d binary packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "puuttuvat riippuvuudet:\n"
@@ -2578,6 +2588,11 @@ msgstr "virhe: en voi avata %s\n"
msgid "Installing %s\n"
msgstr "Asennan: %s\n"
+#: lib/rpminstall.c:1022
+#, fuzzy, c-format
+msgid "rollback %d packages to %s"
+msgstr "poistolle ei määritelty paketteja"
+
#: lib/rpmlead.c:50
#, fuzzy, c-format
msgid "read failed: %s (%d)\n"
@@ -3138,109 +3153,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "virhe etsittäessä pakettia %s\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "en voi lukea headeria %d:stä päivittäessä"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "virhe etsittäessä pakettia %s\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "dbpath ei ole asetettu"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "väliaikainen tietokanta %s on jo olemassa"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "en voi lisätä tietuetta %d:stä"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "en voinut avata %s: %s"
@@ -3463,6 +3478,9 @@ msgstr "virhe: ftpport pitää olla luku\n"
msgid "failed to create %s: %s\n"
msgstr "%s:n luonti epäonnistui\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "poistolle ei määritelty paketteja"
+
#, fuzzy
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "En voinut ajaa pgp:tä"
@@ -3552,9 +3570,6 @@ msgstr "%s:n luonti epäonnistui\n"
#~ msgid "no packages given for signature check"
#~ msgstr "allekirjoituksen tarkistukselle ei määritelty paketteja"
-#~ msgid "no packages given for signing"
-#~ msgstr "allekirjoitukselle ei määritelty paketteja"
-
#, fuzzy
#~ msgid "Usage: rpm {--help}"
#~ msgstr "käyttö: rpm {--help}"
@@ -4773,10 +4788,6 @@ msgstr "%s:n luonti epäonnistui\n"
#~ msgstr "poistolle ei määritelty paketteja"
#, fuzzy
-#~ msgid "found %d packages to uninstall\n"
-#~ msgstr "poistolle ei määritelty paketteja"
-
-#, fuzzy
#~ msgid "error %d reading header: %s\n"
#~ msgstr "virhe luotaessa hakemistoa %s: %s"
diff --git a/po/fr.po b/po/fr.po
index c2a4cea0d..39f7fe640 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -122,7 +122,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr " --root <dir>\t- utilise <dir> comme rpertoire racine"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -453,7 +453,8 @@ msgid "no tar files given for build"
msgstr "aucun package n'a t spcifi pour la construction"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+#, fuzzy
+msgid "no packages given for erase"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
#: rpmqv.c:1047
@@ -716,17 +717,17 @@ msgstr "La construction a chou.\n"
msgid "failed to write all data to %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, fuzzy, c-format
msgid "Failed to find %s:\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1539,37 +1540,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "impossible d'ouvrir: %s\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1704,173 +1710,177 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "%s: Fread failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
#, fuzzy
msgid "relocations must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
#, fuzzy
msgid "<package>+"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
#, fuzzy
msgid "short hand for --replacepkgs --replacefiles"
msgstr " --force - raccourci pour --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
#, fuzzy
msgid "<packagefile>+"
msgstr " -i <packagefile>\t- installe le package"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
#, fuzzy
msgid "print hash marks as package installs (good with -v)"
msgstr ""
" --hash - affiche des '#' pendant l'installation du package "
"(utile avec -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
#, fuzzy
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
@@ -1879,56 +1889,56 @@ msgstr ""
" --oldpackage - mise jour par une ancienne version du package (--"
"force"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
#, fuzzy
msgid "print percentages as package installs"
msgstr ""
" --percent - affiche des '%' pendant l'installation du package"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
#, fuzzy
msgid "install even if the package replaces installed files"
msgstr ""
" --replacefiles - installe mme si le package remplace des fichiers "
"dj prsents"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
#, fuzzy
msgid "reinstall if the package is already present"
msgstr " --replacepkgs - rinstalle si le package est dj prsent"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
#, fuzzy
msgid "don't install, but tell if it would work or not"
msgstr ""
" --test - n'installe pas, mais indique si ca fonctionnerait "
"ou pas"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
#, fuzzy
msgid "upgrade package(s)"
msgstr ""
@@ -2576,7 +2586,7 @@ msgstr "aucun package n'a t spcifi pour l'installation"
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2608,6 +2618,11 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, fuzzy, c-format
+msgid "rollback %d packages to %s"
+msgstr "aucun package n'a t spcifi pour la dsinstallation"
+
#: lib/rpmlead.c:50
#, fuzzy, c-format
msgid "read failed: %s (%d)\n"
@@ -3164,109 +3179,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -3478,6 +3493,9 @@ msgstr ""
msgid "failed to create %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "aucun package n'a t spcifi pour la dsinstallation"
+
#, fuzzy
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "impossible d'ouvrir: %s\n"
@@ -3526,10 +3544,6 @@ msgstr "impossible d'ouvrir: %s\n"
#~ msgstr "aucun package n'a t spcifi pour la vrification de signature"
#, fuzzy
-#~ msgid "no packages given for signing"
-#~ msgstr "aucun package n'a t spcifi pour la dsinstallation"
-
-#, fuzzy
#~ msgid ""
#~ " [--replacepkgs] [--replacefiles] [--root <dir>]"
#~ msgstr ""
@@ -4206,10 +4220,6 @@ msgstr "impossible d'ouvrir: %s\n"
#~ msgstr "aucun package n'a t spcifi pour la dsinstallation"
#, fuzzy
-#~ msgid "found %d packages to uninstall\n"
-#~ msgstr "aucun package n'a t spcifi pour la dsinstallation"
-
-#, fuzzy
#~ msgid "package %s is now obsolete and will be removed\n"
#~ msgstr "aucun package n'a t spcifi pour l'installation"
diff --git a/po/gl.po b/po/gl.po
index 5fbac64ec..197b9c338 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: 2001-01-13 22:31+0100\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -113,7 +113,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -400,7 +400,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -661,17 +661,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1451,37 +1451,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1616,207 +1621,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2417,7 +2426,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2449,6 +2458,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2992,109 +3006,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index ef1c7146c..13e2cae7c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -405,7 +405,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -666,17 +666,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1456,37 +1456,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1621,207 +1626,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2422,7 +2431,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2454,6 +2463,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2997,109 +3011,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/id.po b/po/id.po
index ef1c7146c..13e2cae7c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -405,7 +405,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -666,17 +666,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1456,37 +1456,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1621,207 +1626,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2422,7 +2431,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2454,6 +2463,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2997,109 +3011,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/is.po b/po/is.po
index 010d8ecf3..fea4f7677 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\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"
@@ -113,7 +113,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -400,7 +400,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -661,17 +661,17 @@ msgstr "%s brást\n"
msgid "failed to write all data to %s\n"
msgstr "gat ekki ritađ öll gögn í %s\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr "gat ekki fundiđ %s:\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1457,37 +1457,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1622,207 +1627,211 @@ msgstr "%s: Fseek brást: %s\n"
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr "<pakkaskrá>+"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr "<pakkaskrá>+"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "setja inn pakka"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr "<gömul>=<ný>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr "uppfćra pakka"
@@ -2428,7 +2437,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2460,6 +2469,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -3003,109 +3017,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/it.po b/po/it.po
index ef1c7146c..13e2cae7c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -405,7 +405,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -666,17 +666,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1456,37 +1456,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1621,207 +1626,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2422,7 +2431,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2454,6 +2463,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2997,109 +3011,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index b46aea98a..012330bed 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: 1999-12-01 22:49 +JST\n"
"Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
"Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -122,7 +122,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "ĽČĽĂĽ×ĽÇĽŁĽěĽŻĽČĽę¤Č¤ˇ¤Ć <dir> ¤ňťČÍѤˇ¤Ţ¤š"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -432,8 +432,9 @@ msgid "no tar files given for build"
msgstr "şîŔŽ(build)¤Î¤ż¤á¤Î tar ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "˝đĚž¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -707,17 +708,17 @@ msgstr "%s źşÇÔ"
msgid "failed to write all data to %s\n"
msgstr "Á´¤Ć¤ÎĽÇĄźĽż¤ň %s ¤Ë˝ń¤Ż¤ł¤Č¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
-#: build/files.c:2465
+#: build/files.c:2485
#, fuzzy, c-format
msgid "Finding %s: (using %s)...\n"
msgstr "%s ¤ňĂľ¤ˇ¤Ć¤¤¤Ţ¤š: (%s ¤ňťČÍѤˇ¤Ć¤¤¤Ţ¤š)...\n"
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, fuzzy, c-format
msgid "Failed to find %s:\n"
msgstr "%s ¤ň¸Ť¤Ä¤ą¤ë¤Î¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż:"
-#: build/files.c:2626
+#: build/files.c:2650
#, fuzzy, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "ĽŐĽĄĽ¤Ľë¤Î˝čÍýĂć: %s-%s-%s\n"
@@ -1534,37 +1535,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1705,32 +1711,36 @@ msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "˝üł°¤š¤ëĽŃĽš¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "şĆÇŰĂÖ¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "şĆÇŰĂÖ¤Ď = ¤ň´Ţ¤ó¤Ç¤¤¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "şĆÇŰĂÖ¤Ď = ¤ÎźĄ¤Ë / ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr "ŔßÄę¤ňĽšĽ­ĽĂĽ×¤ˇĄ˘Á´ĽŐĽĄĽ¤Ľë¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1738,144 +1748,144 @@ msgstr ""
"<package> ¤Č°ěĂפš¤ëĽŃĽĂĽąĄźĽ¸Á´¤Ć¤ňşď˝ü¤ˇ¤Ţ¤š(°ěČĚ\n"
"\t\t\t ĹŞ¤ËĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤚ¤ë¤ČĽ¨ĽéĄź¤Ë¤Ę¤ę¤Ţ¤š)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "ĽŃĽĂĽąĄźĽ¸ťŘÄę¤ÎĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "ĽŃĽš %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó(ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ËÂФˇ¤Ć)"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "ĽŃĽĂĽąĄźĽ¸¤ňşď˝ü(Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë)¤ˇ¤Ţ¤š"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
#, fuzzy
msgid "<package>+"
msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "ĽÉĽ­ĽĺĽáĽóĽČ¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
#, fuzzy
msgid "skip files with leading component <path> "
msgstr "ĽŃĽš <path> Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "--replacepkgs ¤Č --replacefiles ¤ňĂť˝Ě¤ˇ¤ż¤â¤Î"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤š"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
#, fuzzy
msgid "<packagefile>+"
msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëşÝ¤Ë '#' ¤ÇÉ˝ź¨¤ˇ¤Ţ¤š(-v ¤ňťČÍѤš¤ë¤ČÎɤ¤)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎÂОݼ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "ĽŃĽĂĽąĄźĽ¸ÂĐžÝOS¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "Ľ¤ĽóĽšĽČĄźĽëÁ°¤ËĽÇĽŁĽšĽŻ¤ÎÍĆÎĚĽÁĽ§ĽĂĽŻ¤ň¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "ĽÉĽ­ĽĺĽáĽóĽČ¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "ĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
"ĽÇĄźĽżĽŮĄźĽš¤ňššżˇ¤ˇ¤Ţ¤š¤ŹĄ˘\n"
"ĽŐĽĄĽ¤ĽëĽˇĽšĽĆĽŕ¤ÎĘŃšš¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"°Í¸Ŕ­¤ňËţ¤ż¤š¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Î\n"
"Ľ¤ĽóĽšĽČĄźĽë¤ňÍ׾ᤡ¤Ţ¤ť¤ó"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
"¤ł¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆĽČĽęĽŹĄź¤ľ¤ě¤ëĽšĽŻĽęĽ×ĽČ¤ň\n"
"źÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "ĽŃĽĂĽąĄźĽ¸ťŘÄę¤ÎĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "Ľ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "Ľ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "Ľ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1883,53 +1893,53 @@ msgstr ""
"¸Ĺ¤¤ĽĐĄźĽ¸ĽçĽó¤ÎĽŃĽĂĽąĄźĽ¸¤ËĽ˘ĽĂĽ×Ľ°ĽěĄźĽÉ¤ˇ¤Ţ¤š\n"
"(Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉťţ¤Î --force ¤Ď¤ł¤ě¤ňźŤĆ°Ĺޤ˚Ԥ¤¤Ţ¤š)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëşÝ¤Ë '%' ¤ÇÉ˝ź¨¤ˇ¤Ţ¤š"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"şĆÇŰĂÖ˛ÄÇ˝¤ĘĽŃĽĂĽąĄźĽ¸¤ËÂФˇĄ˘Ľ¤ĽóĽšĽČĄźĽëĽŃĽš\n"
"ŔÜĆŹź­¤ň <dir> ¤ËŔßÄꤡ¤Ţ¤š"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "<oldpath> ¤Ť¤é <newpath> ¤ËĽŐĽĄĽ¤Ľë¤ňşĆÇŰĂÖ¤ľ¤ť¤Ţ¤š"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
#, fuzzy
msgid "<old>=<new>"
msgstr "<oldpath> ¤Ť¤é <newpath> ¤ËĽŐĽĄĽ¤Ľë¤ňşĆÇŰĂÖ¤ľ¤ť¤Ţ¤š"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
"Ľ¤ĽóĽšĽČĄźĽëťţ¤ËĂÖ¤­´š¤¨¤é¤ě¤ëĽŐĽĄĽ¤Ľë¤Ź\n"
"¤˘¤Ă¤Ć¤âĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "´ű¤Ë¸şß¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ç¤âşĆĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr "Ľ¤ĽóĽšĽČĄźĽë¤ť¤ş¤ËĄ˘ĽĆĽšĽČ¤Î¤ßšÔ¤¤¤Ţ¤š"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
#, fuzzy
msgid "upgrade package(s)"
msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
@@ -2591,7 +2601,7 @@ msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ţ¤ť¤ó\n"
msgid "found %d source and %d binary packages\n"
msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "°Í¸Ŕ­¤ÎˇçÇĄ:\n"
@@ -2623,6 +2633,11 @@ msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
msgid "Installing %s\n"
msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, fuzzy, c-format
msgid "read failed: %s (%d)\n"
@@ -3193,111 +3208,111 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "ĽÇĄźĽżĽŮĄźĽšĂć¤ÎĽěĽłĄźĽÉČÖšć %d ¤ĎÉÔŔľ¤Ç¤š -- ĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "¸Ąş÷¤Î¤ż¤á¤Î %d ¤Ç ĽŘĽĂĽŔ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "name Ľ¤ĽóĽÇĽĂĽŻĽšşď˝ü¤ˇ¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "dbpath ¤ŹŔßÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rootdir %s Ăć¤ÇĽÇĄźĽżĽŮĄźĽš¤ňşĆš˝Ăۤˇ¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "°ěťţĹŞ¤ĘĽÇĄźĽżĽŮĄźĽš %s ¤Ď¤š¤Ç¤Ë¸şß¤ˇ¤Ć¤¤¤Ţ¤š"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "żˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "%d ¤Ë ĽŞĽęĽ¸ĽĘĽë¤ÎĽěĽłĄźĽÉ¤ňÉղäǤ­¤Ţ¤ť¤ó"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ĽÇĄźĽżĽŮĄźĽš¤ÎşĆš˝Ăۤ˟şÇÔ; ĽŞĽęĽ¸ĽĘĽëĽÇĄźĽżĽŮĄźĽš¤Ź¤Ţ¤Ŕ¤˝¤ł¤ËťÄ¤Ă¤Ć¤¤¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ňżˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ËĂÖ¤­´š¤¨¤ë¤Î¤ËźşÇÔ!\n"
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "%s Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňĽęĽŤĽĐĄź¤š¤ë¤ż¤á¤Ë %s ¤Ť¤éĽŐĽĄĽ¤Ľë¤ČĂÖ¤­´š¤¨¤Ţ¤š"
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤Îşď˝üźşÇÔ: %s\n"
@@ -3521,6 +3536,9 @@ msgstr "url ĽÝĄźĽČ¤Ďżôťú¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó\n"
msgid "failed to create %s: %s\n"
msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
+
#, fuzzy
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "pgp ¤ňźÂšÔ¤Ç¤­¤Ţ¤ť¤ó(%s)"
@@ -3616,9 +3634,6 @@ msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
#~ msgid "no packages given for signature check"
#~ msgstr "˝đĚž¸Ąşş¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#~ msgid "no packages given for signing"
-#~ msgstr "˝đĚž¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-
#, fuzzy
#~ msgid "Usage: rpm {--help}"
#~ msgstr "ťČÍŃËĄ: rpm {--help}"
diff --git a/po/ko.po b/po/ko.po
index c8af2b914..26ba7e16d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: 2001-09-07 22:03+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"
@@ -113,7 +113,7 @@ msgstr "<¸íˇÉ>"
msgid "use <dir> as the top level directory"
msgstr "<ľđˇşĹ与> ¸Ś ĂÖťóŔ§ ľđˇşĹ与ˇÎ ťçżëÇŐ´Ď´Ů"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr "<ľđˇşĹ与>"
@@ -407,8 +407,9 @@ msgid "no tar files given for build"
msgstr "ĆĐĹ°Áö ÁŚŔŰżĄ ÇĘżäÇŃ tar ĆÄŔĎŔť ÁöÁ¤ÇĎÁö žĘŔ¸źĚ˝Ŕ´Ď´Ů"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "ÁŚ°Ĺ(uninstall)ÇŇ ĆĐĹ°Áö¸Ś ÁöÁ¤ÇĎÁö žĘŔ¸źĚ˝Ŕ´Ď´Ů"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "ź­¸íÇŇ ĆĐĹ°Áö¸Ś ÁöÁ¤ÇĎÁö žĘŔ¸źĚ˝Ŕ´Ď´Ů"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -672,17 +673,17 @@ msgstr "%s (ŔĚ)°Ą ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
msgid "failed to write all data to %s\n"
msgstr "%s żĄ ¸đľç ŔڡḌ ąâˇĎÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr "%s (Ŕť)¸Ś ĂŁ´Â Áß: (%s ťçżë)...\n"
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr "%s (Ŕť)¸Ś ĂŁ´ÂľĽ ˝ÇĆĐÇÔ:\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "ĆÄŔĎ Ăł¸Ž Áß: %s-%s-%s\n"
@@ -1474,18 +1475,23 @@ msgstr "žĆ´ĎżŔ"
msgid "YES"
msgstr "żš"
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "tsort °ü°čżĄź­ %s-%s-%s \"%s\" (Ŕť)¸Ś ťčÁŚÇŐ´Ď´Ů.\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr "========== tsort °ü°č¸Ś ąâˇĎ(record)ÇŐ´Ď´Ů\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1493,20 +1499,20 @@ msgid ""
msgstr ""
"========== ĆĐĹ°Áö¸Ś tsort ÇŐ´Ď´Ů (źřź­, #źąŔÓŔÚ, #ČÄŔÓŔÚ, ąíŔĚ[depth])\n"
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr "========== ČÄŔÓŔÚ [successors only] (ÇĽÇö źř)\n"
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr "ˇçÇÁ(LOOP):\n"
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr "========== tsort¸Ś ÁřÇŕÇŐ´Ď´Ů...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1645,31 +1651,36 @@ msgstr "%s: readLeadżĄ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: FreadżĄ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr "ÁŚżÜ˝ĂĹł °ćˇÎ´Â šÝľĺ˝Ă '/' ˇÎ ˝ĂŔ۾Ǟîžß ÇŐ´Ď´Ů"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "ŔçščÄĄ˝ĂżĄ´Â šÝľĺ˝Ă '/' ˇÎ ˝ĂŔ۾Ǟîžß ÇŐ´Ď´Ů"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "ŔçščÄĄ˝ĂżĄ´Â šÝľĺ˝Ă '=' ŔĚ Ć÷ÇԾǞîžß ÇŐ´Ď´Ů"
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "ŔçščÄĄ˝ĂżĄ´Â šÝľĺ˝Ă '=' ľÚżĄ '/' °Ą żÍžß ÇŐ´Ď´Ů"
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+#, fuzzy
+msgid "malformed rollback time/date stamp argument"
msgstr "żĂšŮ¸ŁÁö ¸řÇŃ ˇŃšé(rollback) ˝Ă°Ł"
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr "žîś°ÇŃ źłÁ¤żĄ ťó°üžřŔĚ ĆĐĹ°Áö žČŔÇ ¸đľç ĆÄŔĎŔť źłÄĄÇŐ´Ď´Ů"
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1677,133 +1688,133 @@ msgstr ""
"<ĆĐĹ°Áö> Ŕ̸§°ú ŔĎÄĄÇĎ´Â ĆĐĹ°Áö´Â ¸đľÎ ÁŚ°ĹÇŐ´Ď´Ů (<ĆĐĹ°Áö> żĄ żŠˇŻ°łŔÇ ĆĐĹ°"
"Áö¸Ś ÁöÁ¤ÇĎ˝Ç °ćżěżĄ´Â żŔˇů°Ą šßťýľË´Ď´Ů)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr "ĆĐĹ°Áö ˝şĹŠ¸łĆŽ¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr "ŔçščÄĄ ąâ´ÉŔĚ žř´Â ĆĐĹ°ÁöŔÇ ĆÄŔĎŔť ŔçščÄĄÇĎżŠ źłÄĄÇŐ´Ď´Ů"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr "ÇĎşÎ-ľđˇşĹ与ˇÎ Ŕ̸§ şŻ°ć˝Ă ťčÁŚľČ ĆĐĹ°Áö ĆÄŔĎŔť ŔúŔĺÇŐ´Ď´Ů"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "ĆĐĹ°Áö¸Ś (ÁŚ°Ĺ) ťčÁŚÇŐ´Ď´Ů"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr "<ĆĐĹ°Áö>+"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "ĆĐĹ°ÁöżĄ Ć÷ÇÔľČ šŽź­ ĆÄŔĎŔť źłÄĄÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr "<°ćˇÎ> ˇÎ ˝ĂŔ۾Ǵ ĆÄŔĎŔş źłÄĄÇĎÁö žĘ˝Ŕ´Ď´Ů "
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr "<°ćˇÎ>"
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "--replacepkgs żÍ --replacefiles żÉźÇŔť ľż˝ĂżĄ ťçżëÇŐ´Ď´Ů"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr "ąâÁ¸żĄ źłÄĄľČ ĆĐĹ°Áö¸Ś ž÷ą×ˇšŔĚľĺ ÇŐ´Ď´Ů"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr "<ĆĐĹ°ÁöĆÄŔĎ>+"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
"ĆĐĹ°Áö źłÄĄ¸Ś ÇؽøśĹŠ(#)ˇÎ ÇĽ˝ĂÇŐ´Ď´Ů (-v żÉźÇ°ú ÇÔ˛˛ ťçżëÇĎ´Â °ÍŔĚ ÁÁ˝Ŕ´Ď"
"´Ů)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "ĆĐĹ°ÁöŔÇ žĆĹ°ĹŘĂĸŚ °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "ĆĐĹ°ÁöŔÇ żîżľĂźÁŚ¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "ĆĐĹ°Áö¸Ś źłÄĄÇĎąâ ŔüżĄ ľđ˝şĹŠ °ř°ŁŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "ĆĐĹ°ÁöżĄ Ć÷ÇÔľČ šŽź­ ĆÄŔĎŔť źłÄĄÇŐ´Ď´Ů"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "ĆĐĹ°Áö¸Ś źłÄĄÇŐ´Ď´Ů"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "ĆÄŔϽýşĹŰŔť şŻ°ćÇĎÁö žĘ°í, ľĽŔĚĹÍşŁŔĚ˝ş¸Ś °ť˝ĹÇŐ´Ď´Ů"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr "ŔÇÁ¸źşŔĚ ŔÖ´Â ĆĐĹ°Áö¸Ś źłÄĄÇĎľľˇĎ Ŕçżäą¸ÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "%%pre ˝şĹŠ¸łĆŽ¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "%%post ˝şĹŠ¸łĆŽ¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "%%preun ˝şĹŠ¸łĆŽ¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun ˝şĹŠ¸łĆŽ¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "ŔĚ ĆĐĹ°ÁöżĄ ŔÇÇŘ šßťýľÇ´Â ˝şĹŠ¸łĆŽ¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "%%triggerprein ˝şĹŠ¸łĆŽ¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "%%triggerin ˝şĹŠ¸łĆŽ¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "%%triggerun ˝şĹŠ¸łĆŽ¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "%%triggerpostun ˝şĹŠ¸łĆŽ¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1811,48 +1822,49 @@ msgstr ""
"ŔĚŔü šöŔüŔÇ ĆĐĹ°ÁöˇÎ ´Ůżîą×ˇšŔĚľĺ ÇŐ´Ď´Ů (--force żÉźÇŔť ťçżë˝ĂżĄ´Â ŔĚ żÉźÇ"
"ŔĚ ŔÚľżŔ¸ˇÎ ŔűżëľË´Ď´Ů)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "ĆĐĹ°Áö źłÄĄ¸Ś ĆŰźžĆŽ(%)ˇÎ ÇĽ˝ĂÇŐ´Ď´Ů"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"ŔçščÄĄ ąâ´ÉŔĚ ŔÖ´Â ĆĐĹ°ÁöŔÇ °ćżě, ÁöÁ¤ľČ <ľđˇşĹ与> ˇÎ ŔçščÄĄÇĎżŠ źłÄĄÇŐ´Ď´Ů"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr "<ŔĚŔü°ćˇÎ> żĄź­ <ťőˇÎżî°ćˇÎ> ˇÎ ĆÄŔĎŔť ŔçščÄĄ ÇŐ´Ď´Ů"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr "<ŔĚŔü°ćˇÎ>=<ťőˇÎżî°ćˇÎ>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr "ŔçĆĐĹ°ÂĄ(repackaging)Ŕ¸ˇÎ ŔÎÇŘ ťčÁŚľÇ´Â ĆĐĹ°Áö ĆÄŔĎŔť ŔúŔĺÇŐ´Ď´Ů"
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "ĆĐĹ°Áö źłÄĄ˝Ă ąâÁ¸żĄ źłÄĄľÇžî ŔÖ´Â ĆÄŔĎŔť ľ¤žîžš´Ď´Ů"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "ĆĐĹ°Áö°Ą ŔĚšĚ źłÄĄľÇžî ŔÖ´Â °ćżěżĄľľ źłÄĄÇŐ´Ď´Ů"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+#, fuzzy
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr "ťőˇÎżî ĆĐĹ°Áö ťčÁŚ, ŔĚŔü ĆĐĹ°Áö Ŕ石ĥ, łŻÂĽ şšą¸(back to date)"
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr "<łŻÂĽ>"
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr "ĆĐĹ°Áö¸Ś źłÄĄÇĎÁö žĘ°í, ÁŚ´ëˇÎ źłÄĄľÇ´ÂÁö¸¸ ČŽŔÎÇŐ´Ď´Ů"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr "ĆĐĹ°Áö¸Ś ž÷ą×ˇšŔĚľĺ ÇŐ´Ď´Ů"
@@ -2480,7 +2492,7 @@ msgstr "%s (Ŕş)´Â źłÄĄľÉ źö žř˝Ŕ´Ď´Ů\n"
msgid "found %d source and %d binary packages\n"
msgstr "%d ŔÇ źŇ˝şżÍ %d ŔÇ šŮŔ̳ʸŽ ĆĐĹ°Áö¸Ś ĂŁžŇ˝Ŕ´Ď´Ů\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇŘ ˝ÇĆĐÇÔ:\n"
@@ -2512,6 +2524,11 @@ msgstr "%s (Ŕť)¸Ś ż­ źö žřŔ˝: %s\n"
msgid "Installing %s\n"
msgstr "%s (Ŕť)¸Ś źłÄĄÇŐ´Ď´Ů\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -3074,110 +3091,110 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "ĆĐĹ°ÁöŔÇ źö¸Ś źź´Â ľľÁß żŔˇů(%d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "ľĽŔĚĹÍşŁŔĚ˝şŔÇ ˇšÄÚľĺ šřČŁ %u (ŔĚ)°Ą Ŕ߸řľÇžú˝Ŕ´Ď´Ů -- ťýˇŤÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: źŐťóľČ Çě´ő #%u (ŔĚ)°Ą şšą¸(retrieved)ľÇžú˝Ŕ´Ď´Ů, ťýˇŤÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%x ŔÇ Çě´ő¸Ś ŔĐŔť źö žř˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "%2$s ŔÎľŚ˝şżĄź­ \"%1$s\" (Ŕť)¸Ś ťčÁŚÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "%2$s ŔÎľŚ˝şżĄź­ %1$d Ç׸ńľé(entries)Ŕť ťčÁŚÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "ťőˇÎżî ĆĐĹ°Áö¸Ś ščÄĄÇĎ´Â ľľÁß żŔˇů(%d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "%2$s ŔÎľŚ˝şżĄ \"%1$s\" (Ŕť)¸Ś Ăß°ĄÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%2$s ŔÎľŚ˝şżĄ %1$d Ç׸ńľé(entries)Ŕť Ăß°ĄÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "db3¸Ś Ŕ繸Ăŕ ÇŃ ČÄżĄ %s (Ŕť)¸Ś ťčÁŚÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "db°ćˇÎ°Ą źłÁ¤ľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "%2$s żĄ ľĽŔĚĹÍşŁŔĚ˝ş %1$s (Ŕť)¸Ś Ŕ繸Ăŕ ÇŐ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr "Ŕӽà ľĽŔĚĹÍşŁŔĚ˝ş %s (ŔĚ)°Ą ŔĚšĚ Á¸ŔçÇŐ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr "%s ľđˇşĹ与¸Ś ťýźşÇŐ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr "%s ľđˇşĹ与¸Ś ťýźşÇÔ: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "dbapi %d (Ŕť)¸Ś ĹëÇŘ ŔĚŔü ľĽŔĚĹÍşŁŔĚ˝ş¸Ś żą´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "dbapi %d (Ŕť)¸Ś ĹëÇŘ ťőˇÎżî ľĽŔĚĹÍşŁŔĚ˝ş¸Ś żą´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "%u żĄ ˇšÄھ希 Ăß°ĄÇŇ źö žř˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ľĽŔĚĹÍşŁŔĚ˝ş¸Ś Ŕ繸ĂŕÇĎ´ÂľĽ ˝ÇĆĐÇÔ: żřşť ľĽŔĚĹÍşŁŔĚ˝ş´Â ą×´ëˇÎ ŔŻÁöľË´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr "ŔĚŔü ľĽŔĚĹÍşŁŔĚ˝ş¸Ś ťőˇÎżî ľĽŔĚĹÍşŁŔĚ˝şˇÎ ąłĂźÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů!\n"
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "şšą¸ÇĎąâ Ŕ§ÇŘ $2$s ŔÇ ĆÄŔĎŔť $1$s ŔÇ ĆÄŔϡΠąłĂźÇŐ´Ď´Ů"
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr "%s ľđˇşĹ与¸Ś ťčÁŚÇŐ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "%s ľđˇşĹ与¸Ś ťčÁŚÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
@@ -3390,6 +3407,9 @@ msgstr "URL Ć÷ĆŽ´Â šÝľĺ˝Ă źýŔÚŔĚžîžß ÇŐ´Ď´Ů\n"
msgid "failed to create %s: %s\n"
msgstr "%s (Ŕť)¸Ś ťýźşÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "ÁŚ°Ĺ(uninstall)ÇŇ ĆĐĹ°Áö¸Ś ÁöÁ¤ÇĎÁö žĘŔ¸źĚ˝Ŕ´Ď´Ů"
+
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "pgp (%s) (Ŕť)¸Ś ˝ÇÇŕÇŇ źö žř˝Ŕ´Ď´Ů\n"
@@ -3479,9 +3499,6 @@ msgstr "%s (Ŕť)¸Ś ťýźşÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "ź­¸í °ËťçÇŇ ĆĐĹ°Áö¸Ś ÁöÁ¤ÇĎÁö žĘŔ¸źĚ˝Ŕ´Ď´Ů"
-#~ msgid "no packages given for signing"
-#~ msgstr "ź­¸íÇŇ ĆĐĹ°Áö¸Ś ÁöÁ¤ÇĎÁö žĘŔ¸źĚ˝Ŕ´Ď´Ů"
-
#~ msgid "rpm: %s\n"
#~ msgstr "rpm: %s\n"
diff --git a/po/no.po b/po/no.po
index 27744bcfe..8e74e0527 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\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"
@@ -113,7 +113,7 @@ msgstr "<kmd>"
msgid "use <dir> as the top level directory"
msgstr "bruk <katalog> som toppnivĺkatalog"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr "<kat>"
@@ -406,8 +406,9 @@ msgid "no tar files given for build"
msgstr "ingen tar-fil oppgitt for bygging"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "ingen pakker oppgitt for avinstallering"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "ingen pakker oppgitt for signering"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -671,17 +672,17 @@ msgstr "%s feilet\n"
msgid "failed to write all data to %s\n"
msgstr "kunne ikke skrive alle data til %s\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr "Klarte ikke ĺ finne %s:\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1471,37 +1472,42 @@ msgstr "NEI"
msgid "YES"
msgstr "JA"
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1636,31 +1642,35 @@ msgstr "%s: readLead feilet\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread feilet: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr "eksluderingssti mĺ begynne med en /"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "relokasjoner mĺ begynne med en /"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "relokasjoner mĺ inneholde et ="
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "relokasjoner mĺ ha et / etter ="
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:110
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:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1668,131 +1678,131 @@ msgstr ""
"fjern alle pakker som er lik <pakke> (normalt vil en feil genereres hvis "
"<pakke> spesifiserer flere pakker)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr "ikke kjřr pakkespesifikke skriptlet"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr "omplasser filer i ikke-omplasserbar pakke"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr "lagre slettede pakkefiler ved ĺ endre navn til underkatalog"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "slett (avinstaller) pakke"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr "<pakke>+"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "ikke installer dokumentasjon"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr "hopp over filer med innledende komponent <sti> "
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr "<sti>"
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "forkortning for --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr "oppgrader pakke(r) hvis allerede installert"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr "<pakkefil>+"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "skriv ut skigarder etter som pakken installeres (nyttig med -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "ikke verifiser pakkearkitektur"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "ikke verifiser operativsystem for pakken"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "ikke sjekk diskplass fřr installasjon"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "installer dokumentasjon"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "installer pakke"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "oppdater databasen, men ikke modifiser filsystemet"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "ikke verifiser pakkeavhengigheter"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr "ikke ordne pakkeinstallasjon for ĺ tilfredsstille avhengigheter"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "ikke kjřr noen %%pre skriptlet (hvis noen)"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "ikke kjřr %%post skriptlet (hvis noen)"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "ikke kjřr %%preun skriptlet (hvis noen)"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "ikke kjřr %%postun skriptlet (hvis noen)"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "Ikke kjřr noen skriptlets som utlřses av denne pakken"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "ikke kjřr %%triggerprein skriptlets"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "ikke kjřr %%triggerin skriptlets"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "ikke kjřr %%triggerun skriplets"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "ikke kjřr %%triggerpostun skriptlets"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1800,48 +1810,48 @@ msgstr ""
"oppgrader til en gammel versjon av pakken (--force ved oppgraderinger gjřr "
"dette automatisk)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "omplasser pakken til <kat>, hvis den er omplasserbar"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr "omplasser filer fra sti <gml> til <ny>"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr "<gml>=<ny>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr "lagre slettede pakkefiler ved ompakking"
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "installer selv om pakken erstatter installerte filer"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "reinstaller selv om pakken allerede er installert"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
#, fuzzy
msgid "<date>"
msgstr "<sti>"
-#: lib/poptI.c:217
+#: lib/poptI.c:227
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:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr "oppgrader pakke(r)"
@@ -2452,7 +2462,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr "fant %d kilde- og %d binćrpakker\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "feilede avhengigheter:\n"
@@ -2484,6 +2494,11 @@ msgstr "kan ikke ĺpne %s: %s\n"
msgid "Installing %s\n"
msgstr "Installerer %s\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -3029,109 +3044,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3343,6 +3358,9 @@ msgstr "url-port mĺ vćre et tall\n"
msgid "failed to create %s: %s\n"
msgstr "kunne ikke opprette %s: %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "ingen pakker oppgitt for avinstallering"
+
#~ msgid "%5d relocate %s -> %s\n"
#~ msgstr "%5d omplasser %s -> %s\n"
@@ -3395,9 +3413,6 @@ msgstr "kunne ikke opprette %s: %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "ingen pakke oppgitt for signatursjekk"
-#~ msgid "no packages given for signing"
-#~ msgstr "ingen pakker oppgitt for signering"
-
#~ msgid "rpm: %s\n"
#~ msgstr "rpm: %s\n"
diff --git a/po/pl.po b/po/pl.po
index c75241446..b95ae98dd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: 1999-05-25 17:00+0100\n"
"Last-Translator: Paweł Dziekoński <pdziekonski@mml.ch.pwr.wroc.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -121,7 +121,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "użyj <katalogu> jako katalogu najwyższego poziomu"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -422,8 +422,9 @@ msgid "no tar files given for build"
msgstr "nie podano nazw plików tar do budowania"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "nie podano nazw plików do usunięcia"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "nie podano nazwy pakietu do podpisania"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -697,17 +698,17 @@ msgstr "%s nie powiodło się"
msgid "failed to write all data to %s\n"
msgstr "zapisanie wszystkich danych do %s nie powiodło się"
-#: build/files.c:2465
+#: build/files.c:2485
#, fuzzy, c-format
msgid "Finding %s: (using %s)...\n"
msgstr "Wyszukiwanie wymaganych zasobów...\n"
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, fuzzy, c-format
msgid "Failed to find %s:\n"
msgstr "Wyszukiwanie nie powiodło się"
-#: build/files.c:2626
+#: build/files.c:2650
#, fuzzy, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "Przetwarzanie plików: %s\n"
@@ -1517,37 +1518,42 @@ msgstr "NIE DOBRZE"
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "usuwanie indeksu grupy\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1688,33 +1694,37 @@ msgstr "%s: readLead nie powiodło się\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead nie powiodło się\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr "ścieżki wyłączeń muszą się zaczynać od /"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "drzewa przesunięć muszą zaczynać sie od /"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "specyfikacja przesunięcia musi zawierać ="
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "specyfikacja przesunięcia musi zawierać / po ="
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"instaluj wszystkie pliki, nawet konfiguracyjne, które w innym przypadku by "
"pominęto"
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1722,138 +1732,138 @@ 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:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "nie wykonuj żadnych skryptów instalacyjnych"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "nie można użyć ścieżki %s przy przesuwaniu pakietu %s-%s-%s"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "usuń (odinstaluj) pakiet"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
#, fuzzy
msgid "<package>+"
msgstr "znaleziono %d pakietów\n"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "nie instaluj dokumentacji"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
#, fuzzy
msgid "skip files with leading component <path> "
msgstr "pomiń pliki leżące w <ścieżce>"
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "skrócona wersja kombinacji --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "pakiet %s-%s-%s jest już zainstalowany"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <nazwa pakietu>+ "
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "wyświetlaj znaki hash przy instalacji (fajne z -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "nie sprawdzaj architektury systemu"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "nie sprawdzaj rodzaju systemu operacyjnego"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "nie sprawdzaj zajętości dysku przed instalacją"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "zainstaluj dokumentację"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "instaluj pakiet"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "odśwież bazę, ale nie modyfikuj systemu plików"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "nie sprawdzaj zależności pakietu"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr "nie zmieniaj kolejności instalacji pakietów by zapewnić zależności"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "nie wykonuj żadnych etapów"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "nie wykonuj żadnych etapów"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "nie wykonuj żadnych etapów"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nie wykonuj żadnych etapów"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "odpytywanie pakietów zahaczanych przez pakiet"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nie wykonuj żadnych skryptów instalacyjnych"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nie wykonuj żadnych skryptów instalacyjnych"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nie wykonuj żadnych skryptów instalacyjnych"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nie wykonuj żadnych skryptów instalacyjnych"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1861,49 +1871,49 @@ msgstr ""
"uaktualnij do starej wersji (--force robi to samo automatycznie podczas "
"uaktualniania)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "wyświetlaj stan instalacji w procentach"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "przesuń pliki pakietu do drzewa <katalog>, jeśli jest przesuwalny"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "przesuń pliki z drzewa <stara-ścieżka> do drzewa <nowa-ścieżka>"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <stara-ścieżka>=<nowa-ścieżka>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "instaluj nawet gdy pakiet zastępuje inne zainstalowane pliki"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "przeinstaluj jeśli pakiet jest już zainstalowany"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
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:220
+#: lib/poptI.c:230
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <nazwa pakietu>"
@@ -2545,7 +2555,7 @@ msgstr "%s nie może być zainstalowany\n"
msgid "found %d source and %d binary packages\n"
msgstr "znaleziono %d pakietów źródłowych i %d binarnych\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "niespełnione zależności:\n"
@@ -2577,6 +2587,11 @@ msgstr "nie można otworzyć %s\n"
msgid "Installing %s\n"
msgstr "Instalacja %s\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, fuzzy, c-format
msgid "read failed: %s (%d)\n"
@@ -3144,110 +3159,110 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "błąd szukania pakietu %s\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "rekord numer %d w bazie danych jest błędny -- rekord pominięto"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "nie można odczytać nagłówka przy %d dla poszukiwania"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "usuwanie indeksu grupy\n"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "usuwanie indeksu nazw\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "błąd szukania pakietu %s\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "zmiana nazwy %s na %s\n"
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "zmiana nazwy %s na %s\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "ścieżka bazy danych nie została podana"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "odbudowywuję bazę danych w rootdir %s\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "tymczasowa baza danych %s już istnieje"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otwieranie starej bazy danych\n"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otwieranie nowej bazy danych\n"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "nie można dodać rekordu oryginalnie przy %d"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr "przebudowanie bazy nie powiodło się; stara pozostała na miejscu\n"
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr "zamiana starej bazy na nową nie powiodła się!\n"
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "naprawcze zastępowanie plików w %s plikami z %s"
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "usunięcie katalogu %s nie powiodło się: %s\n"
@@ -3463,6 +3478,9 @@ msgstr "port musi być liczbą\n"
msgid "failed to create %s: %s\n"
msgstr "utworzenie %s nie powiodło się\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "nie podano nazw plików do usunięcia"
+
#, fuzzy
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "Nie można uruchomić pgp"
@@ -3555,9 +3573,6 @@ msgstr "utworzenie %s nie powiodło się\n"
#~ msgid "no packages given for signature check"
#~ msgstr "nie podano nazwy pakietu do sprawdzenia sygnatury"
-#~ msgid "no packages given for signing"
-#~ msgstr "nie podano nazwy pakietu do podpisania"
-
#~ msgid "rpm: %s\n"
#~ msgstr "rpm: %s\n"
diff --git a/po/pt.po b/po/pt.po
index e40cccfe7..96ac84d72 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: 2000-06-22 01:13+01:00\n"
"Last-Translator: José Nuno Coelho Sanarra Pires\n"
"Language-Team: pt <kde@poli.org>\n"
@@ -113,7 +113,7 @@ msgstr "<com>"
msgid "use <dir> as the top level directory"
msgstr "usa <dir> como a directoria de topo"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr "<dir>"
@@ -402,8 +402,9 @@ msgid "no tar files given for build"
msgstr "năo foram indicados ficheiros tar para a criaçăo"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "năo foram indicados pacote para desinstalar"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "năo foram indicados pacotes para assinar"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -667,17 +668,17 @@ msgstr "O %s falhou\n"
msgid "failed to write all data to %s\n"
msgstr "năo consegui escrever todos os dados em %s\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr "A procurar o %s: (usando o %s)...\n"
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr "Năo consegui encontrar o %s:\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "A processar os ficheiros: %s-%s-%s\n"
@@ -1472,37 +1473,42 @@ msgstr "NĂO-OK"
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "a remover o %s-%s-%s \"%s\" das relaçőes do tsort.\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr "=========== a guardar as relaçőes do tsort\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr "========== só os sucessores (ordem de apresentaçăo)\n"
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr "CICLO:\n"
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr "========== a prosseguir o tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1639,213 +1645,217 @@ msgstr ":%s: o readLead falhou\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: O fread falhou: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr "as directorias de exclusăo tęm de começar por /"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "os novos locais tęm de começar por /"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "os novos locais tęm de conter um ="
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "os novos locais tęm de ter um / a seguir ao ="
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:110
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:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr "remove todos os pacotes que correspondam a <pacote> (normalmente aparece um erro se o <pacote> especifica vários pacotes)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "năo executa nenhuns scripts específicos do pacote"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr "muda os ficheiros de sítio num pacote de localizaçăo fixa"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "apaga (desinstala) o pacote"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
#, fuzzy
msgid "<package>+"
msgstr "<pacote>"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "năo instala a documentaçăo"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr "ignorar os ficheiros com a componente inicial <dir> "
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "abreviatura para --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "actualizar o pacote se já estiver instalado"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr "<pacote>+"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "mostra cardinais enquanto o pacote instala (conveniente com o -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "năo verifica a arquitectura do pacote"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "năo verifica o sistema operativo do pacote"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "năo verifica o espaço em disco antes de instalar"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "instala a documentaçăo"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "instala o pacote"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
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:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "năo verifica as dependęncias do pacote"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
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:164
+#: lib/poptI.c:174
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "năo executar os scripts (se existirem)"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "năo executar os scripts (se existirem)"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "năo executar os scripts (se existirem)"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "năo executar os scripts (se existirem)"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "năo executar nenhuns 'scriptlets' activados por este pacote"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "năo executa nenhuns scripts específicos do pacote"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "năo executar nenhuns 'scriptlets' de instalaçăo"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "năo executar nenhuns 'scriptlets' de instalaçăo"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "năo executar nenhuns 'scriptlets' de instalaçăo"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr "actualiza para um versăo antiga do pacote (o --force faz isto automaticamente)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "mostra percentagens enquanto o pacote instala"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "muda o pacote para <dir>, se for possível"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "muda os ficheiros de <oldpath> para <newpath>"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
#, fuzzy
msgid "<old>=<new>"
msgstr "<dir_ant>=<dir_nova>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "instala mesmo se o pacote substituir ficheiros instalados"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "reinstalar se o pacote já estiver presente"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
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:220
+#: lib/poptI.c:230
#, fuzzy
msgid "upgrade package(s)"
msgstr "actualizar o pacote"
@@ -2470,7 +2480,7 @@ msgstr "o %s năo pode ser instalado\n"
msgid "found %d source and %d binary packages\n"
msgstr "encontrados %d pacotes com código-fonte e %d binários\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "dependęncias falhadas:\n"
@@ -2502,6 +2512,11 @@ msgstr "năo consigo aceder ao %s: %s\n"
msgid "Installing %s\n"
msgstr "A instalar o %s\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -3054,109 +3069,109 @@ msgstr "está presente uma base de dados antiga; use o --rebuildb para gerar uma
msgid "error(%d) counting packages\n"
msgstr "erro(%d) ao contar os pacotes\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "o número do registo %d na base de dados está errado -- a ignorar.\n"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, 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:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "a remover o \"%s\" do índice %s.\n"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "a remover %d registos do índice %s.\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, 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:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "a adicionar o \"%s\" ao índice %s.\n"
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "a adicionar %d registos ao índice %s.\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "a remover o %s depois duma reconstruçăo bem sucedida do db3.\n"
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "năo foi definido o dbpath"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "a reconstruir a base de dados %s em %s\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr "A base de dados temporária %s já existe\n"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr "a criar a directoria %s\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr "a criar a directoria %s: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "a abrir a base de dados antiga com a dbapi %d\n"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "a abrir a base de dados nova com a dbapi %d\n"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "năo consigo adicionar o registo originalmente em %d\n"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
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:3415
+#: rpmdb/rpmdb.c:3416
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:3417
+#: rpmdb/rpmdb.c:3418
#, 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:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr "a remover a directoria %s\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "falhou a remoçăo da directoria %s: %s\n"
@@ -3368,6 +3383,9 @@ msgstr "o porto do URL tem de ser um número\n"
msgid "failed to create %s: %s\n"
msgstr "năo consegui criar o %s: %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "năo foram indicados pacote para desinstalar"
+
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "Năo consigo executar o pgp (%s)\n"
@@ -3457,9 +3475,6 @@ msgstr "năo consegui criar o %s: %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "năo foram indicados pacotes para verificar as assinaturas"
-#~ msgid "no packages given for signing"
-#~ msgstr "năo foram indicados pacotes para assinar"
-
#~ msgid "rpm: %s\n"
#~ msgstr "rpm: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e5fbe4dd4..b582c8dec 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
#: build.c:36
#, fuzzy
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "use <diretrio> como diretrio raiz"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -450,8 +450,9 @@ msgid "no tar files given for build"
msgstr "no foram passados arquivos tar para construo"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "no foi passado pacote para desinstalao"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "no foram passados pacotes para assinatura"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -738,18 +739,18 @@ msgstr "Construo falhou.\n"
msgid "failed to write all data to %s\n"
msgstr "No consegui abrir o pipe tar: %s\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
# , c-format
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, fuzzy, c-format
msgid "Failed to find %s:\n"
msgstr "No consegui abrir o pipe tar: %s\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1628,38 +1629,43 @@ msgstr ""
msgid "YES"
msgstr ""
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
# , c-format
-#: lib/depends.c:1033
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "No consegui abrir: %s\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1804,33 +1810,37 @@ msgstr "No consegui abrir: %s\n"
msgid "%s: Fread failed: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "argumentos para o --dbpath devem comear com uma /"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
#, fuzzy
msgid "relocations must begin with a /"
msgstr "argumentos para o --dbpath devem comear com uma /"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1838,139 +1848,139 @@ msgstr ""
"remova todos os pacotes iguais a <pacote> (normalmente um erro gerado se "
"<pacote> especificou mltiplos pacotes)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "no execute nenhuma script especfica do pacote"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "no foi passado pacote para instalao"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "apague (desinstale) pacote"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
#, fuzzy
msgid "<package>+"
msgstr "pesquise todos os pacotes"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "no instale documentao"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "alis para --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "no foi passado pacote para instalao"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<estgio> <spec> "
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "mostre caracteres # a medida que o pacote instala (bom com -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
#, fuzzy
msgid "don't verify package architecture"
msgstr "no verifique a arquitetura do pacote"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "no verifique o sistema operacional do pacote"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "instale documentao"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "instale pacote"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "no verifique as dependncias do pacote"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
#, fuzzy
msgid "do not reorder package installation to satisfy dependencies"
msgstr "no verifique as dependncias do pacote"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "no execute nenhum estgio"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "no execute nenhum estgio"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "no execute nenhum estgio"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "no execute nenhum estgio"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "no execute nenhuma script especfica do pacote"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "no execute nenhuma script de instalao"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "no execute nenhuma script de instalao"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "no execute nenhuma script de instalao"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1978,48 +1988,48 @@ msgstr ""
"atualize para uma verso mais velha do pacote (--force em atualizaes no faz "
"isto automaticamente)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "imprima porcentagens a medida que o pacote vai sendo instalado"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "realoque o pacote para <diretrio>, se realocvel"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
#, fuzzy
msgid "<old>=<new>"
msgstr " [--nomd5] [alvos]"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "instale mesmo que o pacote substitua arquivos j instalados"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "reinstale se o pacote j estiver presente"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr "no instale, mas diga se a instalao funcionar ou no"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
#, fuzzy
msgid "upgrade package(s)"
msgstr "instale pacote"
@@ -2682,7 +2692,7 @@ msgstr "no foi passado pacote para instalao"
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
#, fuzzy
msgid "failed dependencies:\n"
msgstr "lista dependncias do pacote"
@@ -2719,6 +2729,11 @@ msgstr "No consegui abrir: %s\n"
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, fuzzy, c-format
+msgid "rollback %d packages to %s"
+msgstr "no foi passado pacote para desinstalao"
+
# , c-format
#: lib/rpmlead.c:50
#, fuzzy, c-format
@@ -3298,103 +3313,103 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "no foi passado pacote para instalao"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "no foi passado pacote para desinstalao"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "no foi passado pacote para instalao"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
@@ -3407,13 +3422,13 @@ msgstr ""
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "RPM verso %s\n"
# , c-format
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "No consegui abrir: %s\n"
@@ -3628,6 +3643,9 @@ msgstr ""
msgid "failed to create %s: %s\n"
msgstr "No consegui abrir o pipe tar: %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "no foi passado pacote para desinstalao"
+
# , c-format
#, fuzzy
#~ msgid "Couldn't exec pgp (%s)\n"
@@ -3734,9 +3752,6 @@ msgstr "No consegui abrir o pipe tar: %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "nenhum pacote informado para checagem de assinatura"
-#~ msgid "no packages given for signing"
-#~ msgstr "no foram passados pacotes para assinatura"
-
#, fuzzy
#~ msgid "Usage: rpm {--help}"
#~ msgstr "uso: rpm {--help}"
@@ -4847,10 +4862,6 @@ msgstr "No consegui abrir o pipe tar: %s\n"
#~ msgstr "no foi passado pacote para desinstalao"
#, fuzzy
-#~ msgid "found %d packages to uninstall\n"
-#~ msgstr "no foi passado pacote para desinstalao"
-
-#, fuzzy
#~ msgid "package %s is now obsolete and will be removed\n"
#~ msgstr "no foi passado pacote para instalao"
diff --git a/po/ro.po b/po/ro.po
index 2349c3523..923d196de 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: 1999-04-10 12:00+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -400,7 +400,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -661,17 +661,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1451,37 +1451,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1616,207 +1621,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2417,7 +2426,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2449,6 +2458,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2992,109 +3006,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index b11c26569..42cd361c3 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-01-30 17:11-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -666,17 +666,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 8403329be..b9fe9ad38 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: 2001-08-29 13:55-0400\n"
"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -115,7 +115,7 @@ msgstr "<ËĎÍÁÎÄÁ>"
msgid "use <dir> as the top level directory"
msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ËÁÔÁĚĎÇ> ËÁË ËĎŇÎĹ×ĎĘ ËÁÔÁĚĎÇ"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr "<ËÁÔÁĚĎÇ>"
@@ -419,8 +419,9 @@ msgid "no tar files given for build"
msgstr "ÎĹ ÚÁÄÁÎŮ tar-ĆÁĘĚŮ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÄÁĚĹÎÉŃ"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐĎÄĐÉÓÉ"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -684,17 +685,17 @@ msgstr "%s ÎĹ ŐÄÁĚĎÓŘ\n"
msgid "failed to write all data to %s\n"
msgstr "ÚÁĐÉÓŘ ×ÓĹČ ÄÁÎÎŮČ × %s ÎĹ ŐÄÁĚÁÓŘ\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr "đĎÉÓË %s (ÉÓĐĎĚŘÚŐŃ %s): ...\n"
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr "îĹ×ĎÚÍĎÖÎĎ ÎÁĘÔÉ %s:\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "ďÂŇÁÂÁÔŮ×ÁŔÔÓŃ ĆÁĘĚŮ: %s-%s-%s\n"
@@ -1492,18 +1493,23 @@ msgstr "îĺT"
msgid "YES"
msgstr "äá"
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "ŐÄÁĚŃĹÔÓŃ %s-%s-%s \"%s\" ÉÚ ŐĐĎŇŃÄĎŢĹÎÎŮČ ÚÁ×ÉÓÉÍĎÓÔĹĘ.\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr "========== ÚÁĐÉÓŘ ŐĐĎŇŃÄĎŢĹÎÎŮČ ÚÁ×ÉÓÉÍĎÓÔĹĘ\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1512,20 +1518,20 @@ msgstr ""
"========== ÓĎŇÔÉŇĎ×ËÁ ĐÁËĹÔĎ× (ĎŢĹŇĹÄÎĎÓÔŘ, #predecessors, #succesors, "
"ÇĚŐÂÉÎÁ)\n"
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr "========== ÔĎĚŘËĎ ĐĎÓĚĹÄĎ×ÁÔĹĚÉ (× ĐĎŇŃÄËĹ ĐŇĹÄÓÔÁ×ĚĹÎÉŃ)\n"
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr "ăéëě:\n"
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr "========== ĐŇĎÄĎĚÖĹÎÉĹ ŐĐĎŇŃÄĎŢĹÎÉŃ ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1663,33 +1669,38 @@ msgstr "%s: ĎŰÉÂËÁ readLead\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: ĎŰÉÂËÁ Fread: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr "ÉÓËĚŔŢĹÎÉŃ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÓĎÄĹŇÖÁÔŘ ="
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÉÍĹÔŘ / ĐĎÓĚĹ ="
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+#, fuzzy
+msgid "malformed rollback time/date stamp argument"
msgstr "ÎĹĐŇÁ×ÉĚŘÎŮĘ ĆĎŇÍÁÔ ×ŇĹÍĹÎÉ ĎÔËÁÔÁ"
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ ×ÓĹ ĆÁĘĚŮ, ÄÁÖĹ ËĎÎĆÉÇŐŇÁĂÉĎÎÎŮĹ, ËĎÔĎŇŮĹ ÍĎÇĚÉ ÂŮ ÂŮÔŘ "
"ĐŇĎĐŐÝĹÎŮ"
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1697,131 +1708,131 @@ msgstr ""
"ŐÄÁĚÉÔŘ ×ÓĹ ĐÁËĹÔŮ, ÓĎ×ĐÁÄÁŔÝÉĹ Ó <ĐÁËĹÔ> (ĎÂŮŢÎĎ, ĹÓĚÉ <ĐÁËĹÔ> "
"ÓĎĎÔ×ĹÔÓÔ×ŐĹÔ ÎĹÓËĎĚŘËÉÍ ĐÁËĹÔÁÍ, ÇĹÎĹŇÉŇŐĹÔÓŃ ĎŰÉÂËÁ)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÎÉËÁËÉČ ÓĂĹÎÁŇÉĹ× ĐÁËĹÔÁ(Ď×)"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĆÁĘĚŮ × ÎĹĐĹŇĹÍĹÝÁĹÍĎÍ ĐÁËĹÔĹ"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr "ÓĎČŇÁÎÉÔŘ × ĐĎÄËÁÔÁĚĎÇĹ ĐĎÄĚĹÖÁÝÉĹ ŐÄÁĚĹÎÉŔ ĆÁĘĚŮ ĐÁËĹÔÁ"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "ŐÄÁĚÉÔŘ (ÄĹÉÎÓÔÁĚĚÉŇĎ×ÁÔŘ) ĐÁËĹÔ"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr "<ĐÁËĹÔ>+"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "ÎĹ ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ ÄĎËŐÍĹÎÔÁĂÉŔ"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr "ĐŇĎĐŐÓÔÉÔŘ ĆÁĘĚŮ × ĐŐÔÉ <ĐŐÔŘ>"
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr "<ĐŐÔŘ>"
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "ÓĎËŇÁÝĹÎÉĹ ÄĚŃ --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr "ĎÂÎĎ×ÉÔŘ ĐÁËĹÔ(Ů) ĹÓĚÉ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr "<ĆÁĘĚ ĐÁËĹÔÁ>+"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "×Ů×ĎÄÉÔŘ \"#\" ĐĎ ÍĹŇĹ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ (ČĎŇĎŰĎ Ó -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÁŇČÉÔĹËÔŐŇŐ ĐÁËĹÔÁ"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĎĐĹŇÁĂÉĎÎÎŐŔ ÓÉÓÔĹÍŐ ĐÁËĹÔÁ"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÄÉÓËĎ×ĎĹ ĐŇĎÓÔŇÁÎÓÔ×Ď ĐĹŇĹÄ ŐÓÔÁÎĎ×ËĎĘ"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "ŐÓÔÁÎĎ×ÉÔŘ ÄĎËŐÍĹÎÔÁĂÉŔ"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "ŐÓÔÁÎĎ×ÉÔŘ ĐÁËĹÔ"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "ĎÂÎĎ×ÉÔŘ ÂÁÚŐ ÄÁÎÎŮČ, ÎĎ ÎĹ ÍĎÄÉĆÉĂÉŇĎ×ÁÔŘ ĆÁĘĚĎ×ŐŔ ÓÉÓÔĹÍŐ"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr "ÎĹ ÍĹÎŃÔŘ ĐĎŇŃÄĎË ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔĎ× ÄĚŃ ŐÄĎ×ĚĹÔ×ĎŇĹÎÉŃ ÚÁ×ÉÓÉÍĎÓÔĹĘ"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%pre ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%post ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%preun ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%postun ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÔŇÉÇÇĹŇ-ÓĂĹÎÁŇÉĹ×, ×Ú×ĹÄĹÎÎŮČ ÜÔÉÍ ĐÁËĹÔĎÍ"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerprein ÓĂĹÎÁŇÉĹ×"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerin ÓĂĹÎÁŇÉĹ×"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerun ÓĂĹÎÁŇÉĹ×"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerpostun ÓĂĹÎÁŇÉĹ×"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1829,49 +1840,50 @@ msgstr ""
"ĎÔËÁÔ ÎÁ ÂĎĚĹĹ ÓÔÁŇŐŔ ×ĹŇÓÉŔ ĐÁËĹÔÁ (--force ĐŇÉ ĎÂÎĎ×ĚĹÎÉÉ ÄĹĚÁĹÔ ÜÔĎ "
"Á×ÔĎÍÁÔÉŢĹÓËÉ)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "×Ů×ĎÄÉÔŘ ĐŇĎĂĹÎÔ ÇĎÔĎ×ÎĎÓÔÉ ĐĎ ÍĹŇĹ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĐÁËĹÔ × <ËÁÔÁĚĎÇ>, ĹÓĚÉ ĐÁËĹÔ ÜÔĎ ĐĎÚ×ĎĚŃĹÔ"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĆÁĘĚŮ ÉÚ ĐŐÔÉ <old> × <new>"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr "ÓĎČŇÁÎÉÔŘ ĐĎÄĚĹÖÁÝÉĹ ŐÄÁĚĹÎÉŔ ĆÁĘĚŮ × ÎĎ×ĎÍ ĐÁËĹÔĹ"
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ, ÄÁÖĹ ĹÓĚÉ ĐÁËĹÔ ĐĹŇĹĐÉŰĹÔ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎÎŮĹ ĆÁĘĚŮ"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "ĐĹŇĹŐÓÔÁÎĎ×ÉÔŘ, ĹÓĚÉ ĐÁËĹÔ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+#, fuzzy
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
"ŐÄÁĚÉÔŘ ÎĎ×ŮĘ(Ĺ) ĐÁËĹÔ(Ů), ĐĹŇĹŐÓÔÁÎĎ×ÉÔŘ ÓÔÁŇŮĘ(Ĺ) ĐÁËĹÔ(Ů), ĎÂŇÁÔÎĎ ÎÁ "
"ŐËÁÚÁÎÎŐŔ ÄÁÔŐ"
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr "<ÄÁÔÁ>"
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr "ÎĹ ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ, Á ÔĎĚŘËĎ ÓĎĎÂÝÉÔŘ, ŐÄÁÓÔÓŃ ĚÉ ŐÓÔÁÎĎ×ËÁ"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr "ĎÂÎĎ×ÉÔŘ ĐÁËĹÔ(Ů)"
@@ -2487,7 +2499,7 @@ msgstr "%s ÎĹ ÍĎÖĹÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎ\n"
msgid "found %d source and %d binary packages\n"
msgstr "ÎÁĘÄĹÎĎ %d ÉÓČĎÄÎŮČ É %d ÂÉÎÁŇÎŮČ ĐÁËĹÔĎ×\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ:\n"
@@ -2519,6 +2531,11 @@ msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
msgid "Installing %s\n"
msgstr "őÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ %s\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -3080,110 +3097,110 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "ĎŰÉÂËÁ(%d) ĐŇÉ ĐĎÄÓŢŁÔĹ ĐÁËĹÔĎ×\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "ÚÁĐÉÓŘ ÎĎÍĹŇ %u × ÂÁÚĹ ÄÁÎÎŮČ ÎĹ×ĹŇÎÁ, ĐŇĎĐŐÓËÁĹÔÓŃ.\n"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: ĐĎĚŐŢĹÎ ĐĎ×ŇĹÖÄĹÎÎŮĘ ÚÁÇĎĚĎ×ĎË #%u, ĐŇĎĐŐÓËÁĹÔÓŃ.\n"
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢĹÓÔŘ ÚÁÇĎĚĎ×ĎË × 0x%x\n"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "ŐÄÁĚŃĹÔÓŃ \"%s\" ÉÚ ÉÎÄĹËÓÁ %s.\n"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "ŐÄÁĚŃĹÔÓŃ %d ÚÁĐÉÓĹĘ ÉÚ ÉÎÄĹËÓÁ %s.\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "ĎŰÉÂËÁ(%d) ŇĹÚĹŇ×ÉŇĎ×ÁÎÉŃ ĐÁÍŃÔÉ ÄĚŃ ĎÂŇÁÚÁ ÎĎ×ĎÇĎ ĐÁËĹÔÁ\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "ÄĎÂÁ×ĚŃĹÔÓŃ \"%s\" × ÉÎÄĹËÓ %s.\n"
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "ÄĎÂÁ×ĚŃĹÔÓŃ %d ÚÁĐÉÓĹĘ × ÉÎÄĹËÓ %s\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "ŐÄÁĚŃĹÔÓŃ %s ĐĎÓĚĹ ŐÓĐĹŰÎĎÇĎ ÚÁ×ĹŇŰĹÎÉŃ ĐĹŇĹÉÎÄĹËÁĂÉÉ ÂÁÚŮ × db3.\n"
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "ĐÁŇÁÍĹÔĹŇ dbpath ÎĹ ŐÓÔÁÎĎ×ĚĹÎ"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ĐĹŇĹÓÔŇÁÉ×ÁĹÔÓŃ ÂÁÚÁ ÄÁÎÎŮČ %s × %s\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr "×ŇĹÍĹÎÎÁŃ ÂÁÚÁ ÄÁÎÎŮČ %s ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ\n"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr "ÓĎÚÄÁŁÔÓŃ ËÁÔÁĚĎÇ %s\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr "ÓĎÚÄÁŁÔÓŃ ËÁÔÁĚĎÇ %s: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÓÔÁŇÁŃ ÂÁÚÁ ÄÁÎÎŮČ ŢĹŇĹÚ dbapi %d\n"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÎĎ×ÁŃ ÂÁÚÁ ÄÁÎÎŮČ ŢĹŇĹÚ dbapi %d\n"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÄĎÂÁ×ÉÔŘ ÚÁĐÉÓŘ (ĐĹŇ×ĎÎÁŢÁĚŘÎĎ × %u)\n"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ĐĹŇĹÓÔŇĎĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ ÎĹ ŐÄÁĚĎÓŘ, ÓÔÁŇÁŃ ÂÁÚÁ ÄÁÎÎŮČ ĎÓÔÁĹÔÓŃ ÎÁ ÍĹÓÔĹ\n"
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÚÁÍĹÎÉÔŘ ÓÔÁŇŐŔ ÂÁÚŐ ÄÁÎÎŮČ ÎÁ ÎĎ×ŐŔ!\n"
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "ĆÁĘĚŮ × %s ÚÁÍĹÎŃŔÔÓŃ ĆÁĘĚÁÍÉ ÉÚ %s ÄĚŃ ×ĎÓÓÔÁÎĎ×ĚĹÎÉŃ"
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr "ŐÄÁĚŃĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "ĎŰÉÂËÁ ŐÄÁĚĹÎÉŃ ËÁÔÁĚĎÇÁ %s: %s\n"
@@ -3395,6 +3412,9 @@ msgstr "url ĐĎŇÔ ÄĎĚÖĹÎ ÂŮÔŘ ŢÉÓĚĎÍ\n"
msgid "failed to create %s: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÄÁĚĹÎÉŃ"
+
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "î×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ pgp (%s)\n"
@@ -3484,9 +3504,6 @@ msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐŇĎ×ĹŇËÉ ĐĎÄĐÉÓÉ"
-#~ msgid "no packages given for signing"
-#~ msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐĎÄĐÉÓÉ"
-
#~ msgid "rpm: %s\n"
#~ msgstr "rpm: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 6554df4f8..3577c3f3b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: 1999-04-08 21:37+02:00\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -115,7 +115,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "použiť <adresár> ako adresár najvyššej úrovne"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -420,8 +420,9 @@ msgid "no tar files given for build"
msgstr "neboli zadané žiadne tar-súbory pre zostavenie"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "neboli zadané žiadne balíky pre odinštalovanie"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "neboli zadané žiadne balíky na podpis"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -695,17 +696,17 @@ msgstr "%s zlyhalo"
msgid "failed to write all data to %s\n"
msgstr "nepodarilo sa zapísať všetky dáta do %s"
-#: build/files.c:2465
+#: build/files.c:2485
#, fuzzy, c-format
msgid "Finding %s: (using %s)...\n"
msgstr "Zisťujú sa požadované vlastnosti...\n"
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, fuzzy, c-format
msgid "Failed to find %s:\n"
msgstr "Nepodarilo sa zistiť poskytované vlastnosti"
-#: build/files.c:2626
+#: build/files.c:2650
#, fuzzy, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "Spracovávajú sa súbory: %s\n"
@@ -1516,37 +1517,42 @@ msgstr "NIE JE V PORIADKU"
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "odstraňuje sa index skupín\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1685,33 +1691,37 @@ msgstr "%s: readLead zlyhalo\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr "vynechané cesty musia začínať znakom /"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "presunutia musia začínať znakom /"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "presunutia musia obsahovať znak ="
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "presunutia musia mať za znakom = znak /"
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"inštalovať všetky súbory vrátane konfiguračných súborov, ktoré by inak mohli "
"byť vynechané"
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1719,138 +1729,138 @@ msgstr ""
"odinštalovať všetky balíky určené <balíkom> (inak je chybou, pokiaľ <balík> "
"špecifikuje viac ako jeden balík)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "nevykonať žiadne skripty špecifikované balíkom"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "balík %s nie je nainštalovaný\n"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "odinštalovať balík"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
#, fuzzy
msgid "<package>+"
msgstr "nájdených %d balíkov\n"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "neinštalovať dokumentáciu"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
#, fuzzy
msgid "skip files with leading component <path> "
msgstr "vynechať súbory v ceste <cesta>"
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "skratka pre --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "balík %s nie je nainštalovaný\n"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <súbor_balíku>+"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "vypisovať značky počas inštalácie balíka (vhodné s -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "neoverovať architektúru balíka"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "neoverovať operačný systém balíka"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "pred inštaláciou nekontrolovať dostupné miesto na disku"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "inštalovať dokumentáciu"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "inštalovať balík"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "aktualizovať databázu bez zmeny súborového systému"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "neoverovať závislosti balíka"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr "nemeniť poradie balíkov kvôli vyriešeniu závislostí"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "nevykonať žiadne etapy"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "nevykonať žiadne etapy"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "nevykonať žiadne etapy"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nevykonať žiadne etapy"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nevykonať žiadne skripty spúšťané týmto balíkom"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nevykonať žiadne skripty špecifikované balíkom"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nevykonať žiadne inštalačné skripty"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nevykonať žiadne inštalačné skripty"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nevykonať žiadne inštalačné skripty"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1858,49 +1868,49 @@ msgstr ""
"aktualizovať na staršiu verziu balíka (--force to pri aktualizácii urobí "
"automaticky)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "vypisovať percentá počas inštalácie balíka"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "presunúť balík do <adresára>, pokiaľ to balík povoľuje"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "presunúť súbory zo <starej_cesty> do <novej_cesty>"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <stará_cesta>=<nová_cesta>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "inštalovať aj pokiaľ balík prepíše inštalované súbory"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "preinštalovať, pokiaľ už balík existuje"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr "neinštalovať, ale oznámiť, či by to bolo možné"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <súbor_balíka>"
@@ -2542,7 +2552,7 @@ msgstr "%s nie je možné nainštalovať\n"
msgid "found %d source and %d binary packages\n"
msgstr "nájdených %d zdrojových a %d binárnych balíkov\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "nevyriešené závislosti:\n"
@@ -2574,6 +2584,11 @@ msgstr "nie je možné otvoriť %s\n"
msgid "Installing %s\n"
msgstr "Inštaluje sa %s\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, fuzzy, c-format
msgid "read failed: %s (%d)\n"
@@ -3141,110 +3156,110 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "chyba pri hľadaní balíka %s\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "záznam číslo %d v databáze je chybný -- bol vynechaný"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "nie je možné prečítať hlavičku na %d pre vyhľadanie"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraňuje sa index skupín\n"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "odstraňuje sa index názvov\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "chyba pri hľadaní balíka %s\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "premenováva sa %s na %s\n"
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "premenováva sa %s na %s\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "nebola nastavená žiadna dbpath"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "znovu sa vytvára databáza v adresári %s\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "dočasná databáza %s už existuje"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otvára sa stará databáza\n"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otvára sa nová databáza\n"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "nie je možné pridať záznam pôvodne na %d"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr "nepodarilo sa znovu vytvoriť databázu; zostáva pôvodná\n"
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr "nepodarilo sa nahradiť starú databázu novou!\n"
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "nepodarilo sa odstrániť adresár %s: %s\n"
@@ -3460,6 +3475,9 @@ msgstr "url port musí byť číslo\n"
msgid "failed to create %s: %s\n"
msgstr "nepodarilo sa vytvoriť %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "neboli zadané žiadne balíky pre odinštalovanie"
+
#, fuzzy
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "Nie je možné spustiť pgp"
@@ -3553,9 +3571,6 @@ msgstr "nepodarilo sa vytvoriť %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "neboli zadané žiadne balíky pre overenie podpisu"
-#~ msgid "no packages given for signing"
-#~ msgstr "neboli zadané žiadne balíky na podpis"
-
#~ msgid "rpm: %s\n"
#~ msgstr "rpm: %s\n"
diff --git a/po/sl.po b/po/sl.po
index a4a8ebfab..e8cda31be 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
# -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
# Copyright (C) 2000 Free Software Foundation, Inc.
# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.223 2002/01/27 16:49:09 jbj Exp $
+# $Id: sl.po,v 1.224 2002/02/01 15:20:21 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\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"
@@ -119,7 +119,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "uporabi <imenik> za korenski imenik"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -418,8 +418,9 @@ msgid "no tar files given for build"
msgstr "arhiv tar za izgradnjo manjka"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "paketi katere bi bilo potrebno odstraniti niso navedeni"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "paketi katere bi bilo potrebno podpisati niso navedeni"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -693,17 +694,17 @@ msgstr "%s neuspešen"
msgid "failed to write all data to %s\n"
msgstr "pisanje podatkov v %s je bilo neuspešno"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr "Iskanje %s: (z uporabo %s)...\n"
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, fuzzy, c-format
msgid "Failed to find %s:\n"
msgstr "Neuspešno iskanje %s:"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "Obdeloavnje datotek: %s-%s-%s\n"
@@ -1517,37 +1518,42 @@ msgstr "NI DOBRO"
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "odstranjujemo seznam skupin\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1686,32 +1692,36 @@ msgstr "%s: readLead je bil neuspešen\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: branje Fread je bilo neuspešno: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr "poti, ki niso obdelane, se morajo začeti z /"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "premikanja se morajo začeti z /"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "premikanja morajo vsebovati ="
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "premikanja morajo imeti /, ki mu sledi ="
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"namestitev vseh datotek, vključno z nastavitvenimi, ki so sicer izpuščene"
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1719,138 +1729,138 @@ msgstr ""
"odstrani vse pakete, ki vsebujejo vzorec <paket> (sicer program izide z "
"napako, če paket <paket> določa več paketov)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "brez izvajanja skriptov paketa"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "izbriši (odstrani) paket"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
#, fuzzy
msgid "<package>+"
msgstr "ni paketov\n"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "brez namestitve dokumentacije"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
#, fuzzy
msgid "skip files with leading component <path> "
msgstr "preskok datotek v navedeni poti"
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "okrajšava za --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "paket %s-%s-%s je že nameščen"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <paket>+ "
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "z izpisom znakov # ob namestitvi (uporabno z -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "brez preverjanja arhitekture paketa"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "brez preverjanja operacijskega sistema paketa"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "brez preverjanja prostora na disku pred nameščanjem"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "namesti dokumentacijo"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "nameščanje paketa"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "obnovi podatkovno zbirko, a ne spreminjaj datotečnega sistema"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "brez preverjanja soodvisnosti paketa"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "brez izvajanja katerihkoli skriptov, ki jih požene ta paket"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "brez izvajanja skriptov paketa"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1858,49 +1868,49 @@ msgstr ""
"nadgraditev na starejšo različico paketa (--force pri nadgradnjah "
"avtomatično vključi to izbiro)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "izpis odstotkov med namestitvijo"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "če je mogoče, bo paket prestavljen v imenik <imenik>"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "prestavljanje datoteke iz stare poti v novo"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <starapot>=<novapot>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "namesti, četudi paket piše prek že nameščene datoteke"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "ponovno namesti, če paket že obstaja"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr "ne namesti, a ugotovi, če bi delovalo"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <paket> "
@@ -2542,7 +2552,7 @@ msgstr "%s ni možno namestiti\n"
msgid "found %d source and %d binary packages\n"
msgstr "najdeno %d izvornih in %d binarnih paketov\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "neuspešne soodvisnosti:\n"
@@ -2574,6 +2584,11 @@ msgstr "ni možno odpreti %s: %s\n"
msgid "Installing %s\n"
msgstr "Nameščanje %s\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, fuzzy, c-format
msgid "read failed: %s (%d)\n"
@@ -3142,112 +3157,112 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "napaka(%d) pri štetju paketov"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "zapis št. %d v zbirki je poškodovan -- preskočeno."
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ni možno prebrati glave pri 0x%x"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstranjevanje \"%s\" iz kazala %s.\n"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "odstranjevanje %d vnosov iz kazala %s\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "napaka(%d) pri iskanju paketa %s\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "dodajanje \"%s\" v kazalo %s.\n"
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "dodajanje %d vnosov v kazalo %s.\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "dbpath ni nastavljena"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "začasna podatkovna zbirka %s že obstaja"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "ustvarjanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "ustvarjanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "odpiranje stare podatkovne zbirke\n"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "zapisa ni možno dodati na %d"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ponovna izgradnja podatkovne zbirke je bila neuspešna; stara ostaja na\n"
"istem mestu\n"
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspešna!\n"
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, 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:3427
+#: rpmdb/rpmdb.c:3428
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "odstranjevanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspešna odstranitev imenika %s: %s\n"
@@ -3463,6 +3478,9 @@ msgstr "vrata URL morajo biti številka\n"
msgid "failed to create %s: %s\n"
msgstr "neuspešno ustvarjanje %s: %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "paketi katere bi bilo potrebno odstraniti niso navedeni"
+
#, fuzzy
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "Ni možno pognati pgp (%s)"
@@ -3558,9 +3576,6 @@ msgstr "neuspešno ustvarjanje %s: %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "paketi za katere bi bilo potrebno preveriti podpis niso navedeni"
-#~ msgid "no packages given for signing"
-#~ msgstr "paketi katere bi bilo potrebno podpisati niso navedeni"
-
#~ msgid "rpm: %s\n"
#~ msgstr "rpm: %s\n"
diff --git a/po/sr.po b/po/sr.po
index 5a239a223..f9b9e78a8 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
@@ -112,7 +112,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "koristi <dir> kao direktorijum najvišeg nivoa"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -415,8 +415,9 @@ msgid "no tar files given for build"
msgstr "nedostaju 'tar' datoteke za kreiranje"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "neodstaje paket za deinstalaciju"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "nedostaje paket za potpisivanje"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -683,17 +684,17 @@ msgstr "PGP omanuo"
msgid "failed to write all data to %s\n"
msgstr "neuspelo kreiranje %s\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, fuzzy, c-format
msgid "Failed to find %s:\n"
msgstr "neuspelo kreiranje %s\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, fuzzy, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "neuspelo otvaranje %s: %s"
@@ -1504,37 +1505,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "greška uklanjanja sloga %s u %s"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1673,33 +1679,37 @@ msgstr "%s: Neuspeo 'readLead'\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "premeštanja moraju početi znakom '/'"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "premeštanja moraju početi znakom '/'"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "premeštanja moraju imati znak ="
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "premeštanja moraju imati / praćeno sa ="
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"instaliraj sve datoteke, čak i konfiguracije koje bi inače bile preskočene"
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1707,187 +1717,187 @@ msgstr ""
"ukloni sve pakete koji odgovaraju <paketu> (normalno, javlja se greška ako "
"<paket> označava više paketa)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
#, fuzzy
msgid "do not execute package scriptlet(s)"
msgstr "nemoj izvršiti nijedan skript iz paketa"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "paket %s nije instaliran\n"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "izbriši (deinstaliraj) paket"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
#, fuzzy
msgid "<package>+"
msgstr "upit nad svim paketima"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "nemoj da instaliraš dokumentaciju"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "skraćenica za --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
#, fuzzy
msgid "upgrade package(s) if already installed"
msgstr "paket %s nije instaliran\n"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<faza> <spec>\t "
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "piši heš-znak (#) kako odmiče instaliranje paketa (dobro dođe sa -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "nemoj proveravati arhitekturu paketa"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "nemoj proveravati operativni sistem za paket"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "instaliraj dokumentaciju"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "instaliraj paket"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "ažuriraj bazu podataka, ali nemoj menjati fajl-sistem"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "nemoj proveravati zavisnosti paketa"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"nemoj preurediti redosled instalacije paketa kako bi zadovoljio zavisnosti"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, fuzzy, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "nemoj izvršiti nijednu fazu"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, fuzzy, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "nemoj izvršiti nijednu fazu"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, fuzzy, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "nemoj izvršiti nijednu fazu"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, fuzzy, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nemoj izvršiti nijednu fazu"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "upit nad paketom koji ima <datoteku>"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nemoj izvršiti nijedan skript iz paketa"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nemoj izvršiti nijedan instalacioni skript"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nemoj izvršiti nijedan instalacioni skript"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nemoj izvršiti nijedan instalacioni skript"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
"ažuriraj na staru verziju paketa (--force kod ažuriranja ovo radi automatski)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "piši procente instalacije paketa"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "premesti paket u <dir>, ako se može premestiti"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
#, fuzzy
msgid "<old>=<new>"
msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "instaliraj čak iako će paket zameniti instalirane datoteke"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "ponovo instaliraj ako je paket već prisutan"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr "nemoj instalirati, ali reci da li će da radi ili ne"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
#, fuzzy
msgid "upgrade package(s)"
msgstr "instaliraj paket"
@@ -2536,7 +2546,7 @@ msgstr "greška: %s se ne može instalirati\n"
msgid "found %d source and %d binary packages\n"
msgstr "grupa %s ne sadrži nijedan paket\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "loše međuzavisnosti:\n"
@@ -2569,6 +2579,11 @@ msgstr "greška: ne mogu da otvorim %s\n"
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
+#: lib/rpminstall.c:1022
+#, fuzzy, c-format
+msgid "rollback %d packages to %s"
+msgstr "neodstaje paket za deinstalaciju"
+
#: lib/rpmlead.c:50
#, fuzzy, c-format
msgid "read failed: %s (%d)\n"
@@ -3129,109 +3144,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "greška kod potrage za paketom %s\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "slog broj %d u bazi podataka je neispravan -- preskačem ga"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "ne mogu da pročitam zaglavlje na %d za proveru"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "greška uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "greška uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "greška kod potrage za paketom %s\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "greška uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "dbpath nije određen"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "privremena baza podataka %s već postoji"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "ne mogu da dodam slog originalno na %d"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
@@ -3454,6 +3469,9 @@ msgstr "greška: FTP port mora biti broj\n"
msgid "failed to create %s: %s\n"
msgstr "neuspelo kreiranje %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "neodstaje paket za deinstalaciju"
+
#, fuzzy
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "Ne mogu da izvršim PGP"
@@ -3543,9 +3561,6 @@ msgstr "neuspelo kreiranje %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "nedostaje paket za proveru potpisa"
-#~ msgid "no packages given for signing"
-#~ msgstr "nedostaje paket za potpisivanje"
-
#, fuzzy
#~ msgid "Usage: rpm {--help}"
#~ msgstr "korišćenje: {rpm --help}"
@@ -4606,10 +4621,6 @@ msgstr "neuspelo kreiranje %s\n"
#~ msgstr "neodstaje paket za deinstalaciju"
#, fuzzy
-#~ msgid "found %d packages to uninstall\n"
-#~ msgstr "neodstaje paket za deinstalaciju"
-
-#, fuzzy
#~ msgid "error %d reading header: %s\n"
#~ msgstr "greška kod kreiranja direktorijuma %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 78bf948e0..57601a309 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: 2001-09-12 14:18+0200\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -113,7 +113,7 @@ msgstr "<kommando>"
msgid "use <dir> as the top level directory"
msgstr "använd <kat> som toppkatalog"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr "<kat>"
@@ -410,8 +410,9 @@ msgid "no tar files given for build"
msgstr "inga tar-filer angivna för tillverkning"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "inga paket angivna för avinstallation"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "inga paket angivna för signering"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -675,17 +676,17 @@ msgstr "%s misslyckades\n"
msgid "failed to write all data to %s\n"
msgstr "kunde inte skriva all data till %s\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr "Letar upp %s: (använder %s)...\n"
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr "Misslyckades med att hitta %s:\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "Bearbetar filer: %s-%s-%s\n"
@@ -1477,18 +1478,23 @@ msgstr "NEJ "
msgid "YES"
msgstr "JA"
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "tar bort %s-%s-%s \"%s\" frĺn tsort-relationer.\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr "========== noterar alla relationer\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1496,20 +1502,20 @@ msgid ""
msgstr ""
"========== tsort:erar paket (ordning, #föregĺngare, #efterföljare, djup)\n"
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr "========== endast efterföljare (presentationsordning)\n"
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr "LOOP:\n"
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr "========== fortsätter med tsort ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1647,32 +1653,37 @@ msgstr "%s: readLead misslyckades\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread misslyckades: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr "uteslutna sökvägar mĺste börja med /"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "omflyttningar mĺste börja med /"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "omflyttningar mĺste innehĺlla ett ="
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "omflyttningar mĺste ha ett / efter ="
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+#, fuzzy
+msgid "malformed rollback time/date stamp argument"
msgstr "felformaterad ĺtergĺngstid"
-#: lib/poptI.c:100
+#: lib/poptI.c:110
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:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1680,132 +1691,132 @@ msgstr ""
"ta bort alla paket som matchar <paket> (normalt ger det ett fel om <paket> "
"anger flera paket)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr "kör inte paketskript"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr "relokera filer i ej relokerbart paket"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr "spara raderade paketfiler genom att spara dem i underkatalog"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "radera (avinstallera) paket"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr "<paket>+"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "installera inte dokumentation"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr "hoppa över filer med inledande <sökväg>"
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr "<sökväg>"
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "kortform för --replacepkgs --replacefiles"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr "uppgradera paket om redan installerat/de"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr "<paketfil>+"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
"skriv ut brädgĺrdar allteftersom paketet installeras (bra tillsammans med -v)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "verifiera inte paketarkitektur"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "verifiera inte paketets operativsystem"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "kontrollera inte diskutrymme före installation"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "installera dokumentation"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "installera paket"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "uppdatera databasen, men ändra inte filsystemet"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "verifiera inte paketberoenden"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr "flytta inte om paketinstallationen för att tillfredsställa beroenden"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "utför inte (eventuellt) %%pre-skript"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "utför inte (eventuellt) %%post-skript"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "utför inte (eventuellt) %%preun-skript"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "utför inte (eventuellt) %%postun-skript"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "kör inte skript utlösta av detta paket"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "kör inte %%triggerprein-skript"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "kör inte %%triggerin-skript"
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "kör inte %%triggerun-skript"
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "kör inte %%triggerpostun-skript"
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1813,48 +1824,49 @@ msgstr ""
"uppgradera till en gammal version av paketet (--force vid uppgraderingar gör "
"detta automatiskt)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "skriv procent allt eftersom paketet installeras"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "flytta paketet till <katalog>, om flyttbart"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr "relokera filer frĺn <gammal> till <ny>"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr "<gammal>=<ny>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr "spara raderade paketfiler genom ompaketering"
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "installera även om paketet byter ut installerade filer"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "installera om ifall paketet redan är installerat"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+#, fuzzy
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
"avinstallera nya paket och ominstallera gamla paket tillbaka till datum"
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr "<datum>"
-#: lib/poptI.c:217
+#: lib/poptI.c:227
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:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr "uppgradera paket"
@@ -2471,7 +2483,7 @@ msgstr "%s kan inte installeras\n"
msgid "found %d source and %d binary packages\n"
msgstr "hittade %d käll- och %d binärpaket\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "ouppfyllda beroenden:\n"
@@ -2503,6 +2515,11 @@ msgstr "kan inte öppna %s: %s\n"
msgid "Installing %s\n"
msgstr "Installerar %s\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -3061,109 +3078,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "fel(%d) när paket räknades\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n"
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: kan inte läsa huvud vid 0x%x\n"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "tar bort \"%s\" frĺn %s-indexet.\n"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "tar bort %d poster frĺn %s-indexet.\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "fel(%d) vid allokering av ny paketinstans\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "lägger till \"%s\" till %s-indexet.\n"
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "lägger till %d poster till %s-indexet.\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "tar bort %s efter lyckad db3-ombyggnad.\n"
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "ingen dbpath har satts"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "bygger om databas %s till %s\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr "tillfällig databas %s existerar redan\n"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr "skapar katalog %s\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr "skapar katalog %s: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "öppnar gammal databas med dbapi %d\n"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "öppnar ny databas med dbapi %d\n"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kan inte lägga till post ursprungligen vid %u\n"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr "kunde inte ersätta gammal databas med ny databas!\n"
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "byt ut filer i %s med filer frĺn %s för att ĺterställa"
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr "tar bort katalog %s\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunde inte ta bort katalogen %s: %s\n"
@@ -3375,6 +3392,9 @@ msgstr "url-port mĺste vara ett tal\n"
msgid "failed to create %s: %s\n"
msgstr "kunde inte skapa %s: %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "inga paket angivna för avinstallation"
+
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "Kunde inte köra pgp (%s)\n"
@@ -3464,9 +3484,6 @@ msgstr "kunde inte skapa %s: %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "inga paket angivna för signaturkontroll"
-#~ msgid "no packages given for signing"
-#~ msgstr "inga paket angivna för signering"
-
#~ msgid "rpm: %s\n"
#~ msgstr "rpm: %s\n"
diff --git a/po/tr.po b/po/tr.po
index e6225d322..5de487154 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\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"
@@ -114,7 +114,7 @@ msgstr "<kmt>"
msgid "use <dir> as the top level directory"
msgstr "Üst düzey dizin olarak <dizin> kullanýlýr"
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr "<dizin>"
@@ -417,8 +417,9 @@ msgid "no tar files given for build"
msgstr "oluţturma için gereken tar dosyalarý belirtilmemiţ"
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
-msgstr "sistemden silinecek paket(ler) belirtilmedi"
+#, fuzzy
+msgid "no packages given for erase"
+msgstr "imzalanacak paket(ler) belirtilmedi"
#: rpmqv.c:1047
msgid "no packages given for install"
@@ -682,17 +683,17 @@ msgstr "%s baţarýsýz\n"
msgid "failed to write all data to %s\n"
msgstr "tüm veri %s içine yazýlamadý\n"
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr "%s aranýyor: (%s kullanarak)...\n"
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr "%s bulunamadý:\n"
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr "Ýţlenen dosyalar: %s-%s-%s\n"
@@ -1497,18 +1498,23 @@ msgstr "HAYIR "
msgid "YES"
msgstr "EVET"
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, fuzzy, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr "tsort bađýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n"
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr "========== tsort bađýntýlarý kaydediliyor\n"
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
#, fuzzy
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1516,20 +1522,20 @@ msgid ""
msgstr ""
"========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n"
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr "========== sadece ardýllar (sunum sýrasý)\n"
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr "ÇEVRÝM:\n"
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr "========== tsort sürüyor ...\n"
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1669,31 +1675,36 @@ msgstr "%s: readLead baţarýsýz\n"
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread baţarýsýz: %s\n"
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr "dýţlanan dosya yolu / ile baţlamalý"
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr "yeniden konumlandýrma iţlemleri / ile baţlamalý"
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr "yeniden konumlandýrma iţlemleri = içermelidir"
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr "yeniden konumlandýrma için = den sonra bir / gerekir"
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+#, fuzzy
+msgid "malformed rollback time/date stamp argument"
msgstr "tekrarlama zamaný bozuk"
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr "yapýlandýrmalarda atlanmýţ bile olsa tüm dosyalarý kurar"
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -1701,133 +1712,133 @@ msgstr ""
"<paket> ile eţlenen tüm paketleri kaldýrýr(<paket> ile çok sayýda paket "
"belirtilmiţse normalde bir hata oluţur)"
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr "paket betikleri çalýţtýrýlmaz"
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr "yeniden konumlanamayan paketin dosyalarýný yeniden konumlandýrýr"
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
"ismi deđiţtirilerek alt dizine kaydedilmek suretiyle silinen dosyalarý "
"kaydeder"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr "paketi kaldýrýr"
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr "<paket>+"
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr "belgeleri kurmaz"
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr "<dosyayolu> ile baţlayan dosyalarý atlar "
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr "<dosyaYolu>"
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr "--replacepkgs --replacefiles için kýsaltma"
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr "paket(ler) kurulu ise paket(ler)i günceller"
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr "<paketDosyasý>+"
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr "paketin kurulma sürecini gösteren imler basar (-v ile)"
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr "paket mimarisi denetlenmez"
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr "paketin ait olduđu iţletim sistemini dođrulamaz"
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr "yüklemeden önce yeterli disk alaný kontrolu yapmaz"
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr "paket ile gelen belgeleri kurar"
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr "paketi kurar"
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr "veri tabanýný günceller, ama dosya sistemini deđiţtirmez"
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr "paket bađýmlýlýklarýný denetlemez"
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr "paket kurulum sýrasýný bađýmlýlýklara göre düzenlemez"
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "%%pre betiđi (varsa) çalýţtýrýlmaz"
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "%%post betiđi (varsa) çalýţtýrýlmaz"
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "%%preun betiđi (varsa) çalýţtýrýlmaz"
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun betiđi (varsa) çalýţtýrýlmaz"
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "bu paket tarafýndan tetiklenen hiç bir betik çalýţtýrýlmaz"
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "hiçbir %%triggerprein betiđi çalýţtýrýlmaz"
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "hiçbir %%triggerin betiđi çalýţtýrýlmaz."
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "hiçbir %%triggerun betiđi çalýţtýrýlmaz."
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "hiçbir %%triggerpostun betiđi çalýţtýrýlmaz."
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1835,48 +1846,49 @@ msgstr ""
"paketin eski bir sürüme güncellenmesini sađlar (--force ayný iţi otomatik "
"yapar)"
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr "kurulumun geliţimi yüzde olarak gösterilir"
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr "eđer deđitirilebiliyorsa paketin yerini <dizin>'e deđiţtirir"
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr "dosyalarý <eski> dizininden kaldýrýp <yeni> dizinine yerleţtirir"
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr "<eski>=<yeni>"
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr "yeniden paketleme sýrasýnda silinen paket dosyalarýný kaydeder"
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr "paket dosyalarý mevcut dosyalarla yer deđiţtirse bile paketi kurar"
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr "paketi yeniden kurar"
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+#, fuzzy
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
"yeni paket(ler) kaldýrýlýr, geriye dönük eski paket(ler) yeniden kurulur"
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr "<tarih>"
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr "yükleme yapmaz, sadece çalýţýp çalýţmayacađýný belirtir"
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr "paket günceller"
@@ -2494,7 +2506,7 @@ msgstr "%s yüklenemedi\n"
msgid "found %d source and %d binary packages\n"
msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr "bađýmlýlýklarda hata; gerekli paketler:\n"
@@ -2526,6 +2538,11 @@ msgstr "%s açýlamadý: %s\n"
msgid "Installing %s\n"
msgstr "%s kuruluyor\n"
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -3083,111 +3100,111 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr "paketler taranýrken hata(%d)\n"
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n"
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: bozuk baţlýk örneđi #%u alýndý, atlanýyor.\n"
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%x de baţlýk okunamadý\n"
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "\"%s\" %s indeksinden siliniyor.\n"
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "%d girdi %s indeksinden siliniyor.\n"
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "yeni paket örneđini tutma hatasý(%d)\n"
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "\"%s\" %s indeksine ekleniyor.\n"
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%d girdi %s indeksine ekleniyor.\n"
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "baţarýlý db3 yeniden oluţturma ertesinde %s kaldýrýlýyor\n"
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr "belirtilmiţ bir dbpath yok"
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "%s veritabaný %s içinde yeniden oluţturuluyor\n"
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr "geçici veritabaný %s zaten mevcut\n"
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr "%s dizini oluţturuluyor\n"
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr "%s dizini oluţturuluyor: %s\n"
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "eski veritabaný dbapi %d ile açýlýyor\n"
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "yeni veritabaný dbapi %d ile açýlýyor\n"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kayýt özgün olarak %u e eklenemedi\n"
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"veritabaný yeniden oluţturulamadý: mevcut veritabaný deđiţmeden\n"
"yerinde býrakýldý\n"
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr "eski veritabanýnýn yenisiyle deđiţtirilirmesi baţarýsýz!\n"
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deđiţtiriliyor"
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr "%s dizini siliniyor\n"
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "%s dizininin silinmesi baţarýsýz: %s\n"
@@ -3399,6 +3416,9 @@ msgstr "url portu bir sayý olmalý\n"
msgid "failed to create %s: %s\n"
msgstr "%s oluţturulamadý: %s\n"
+#~ msgid "no packages given for uninstall"
+#~ msgstr "sistemden silinecek paket(ler) belirtilmedi"
+
#~ msgid "Couldn't exec pgp (%s)\n"
#~ msgstr "pgp çalýţtýrýlamadý (%s)\n"
@@ -3488,9 +3508,6 @@ msgstr "%s oluţturulamadý: %s\n"
#~ msgid "no packages given for signature check"
#~ msgstr "imzasý kontrol edilecek paket(ler) belirtilmedi"
-#~ msgid "no packages given for signing"
-#~ msgstr "imzalanacak paket(ler) belirtilmedi"
-
#~ msgid "rpm: %s\n"
#~ msgstr "rpm: %s\n"
diff --git a/po/uk.po b/po/uk.po
index ef1c7146c..13e2cae7c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -405,7 +405,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -666,17 +666,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1456,37 +1456,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1621,207 +1626,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2422,7 +2431,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2454,6 +2463,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2997,109 +3011,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/wa.po b/po/wa.po
index ef1c7146c..13e2cae7c 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -405,7 +405,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -666,17 +666,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1456,37 +1456,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1621,207 +1626,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2422,7 +2431,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2454,6 +2463,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2997,109 +3011,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/zh.po b/po/zh.po
index ef1c7146c..13e2cae7c 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -405,7 +405,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -666,17 +666,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1456,37 +1456,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1621,207 +1626,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2422,7 +2431,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2454,6 +2463,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2997,109 +3011,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index ef1c7146c..13e2cae7c 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
msgid "<dir>"
msgstr ""
@@ -405,7 +405,7 @@ msgid "no tar files given for build"
msgstr ""
#: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
msgstr ""
#: rpmqv.c:1047
@@ -666,17 +666,17 @@ msgstr ""
msgid "failed to write all data to %s\n"
msgstr ""
-#: build/files.c:2465
+#: build/files.c:2485
#, c-format
msgid "Finding %s: (using %s)...\n"
msgstr ""
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
#, c-format
msgid "Failed to find %s:\n"
msgstr ""
-#: build/files.c:2626
+#: build/files.c:2650
#, c-format
msgid "Processing files: %s-%s-%s\n"
msgstr ""
@@ -1456,37 +1456,42 @@ msgstr ""
msgid "YES"
msgstr ""
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
#, c-format
msgid "removing %s \"%s\" from tsort relations.\n"
msgstr ""
#. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
msgid ""
"========== tsorting packages (order, #predecessors, #succesors, tree, "
"depth)\n"
msgstr ""
-#: lib/depends.c:1502
+#: lib/depends.c:1540
msgid "========== successors only (presentation order)\n"
msgstr ""
-#: lib/depends.c:1572
+#: lib/depends.c:1610
msgid "LOOP:\n"
msgstr ""
-#: lib/depends.c:1607
+#: lib/depends.c:1645
msgid "========== continuing tsort ...\n"
msgstr ""
#. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
#, c-format
msgid "rpmdepOrder failed, %d elements remain\n"
msgstr ""
@@ -1621,207 +1626,211 @@ msgstr ""
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/poptI.c:47
+#: lib/poptI.c:53
msgid "exclude paths must begin with a /"
msgstr ""
-#: lib/poptI.c:59
+#: lib/poptI.c:65
msgid "relocations must begin with a /"
msgstr ""
-#: lib/poptI.c:61
+#: lib/poptI.c:67
msgid "relocations must contain a ="
msgstr ""
-#: lib/poptI.c:64
+#: lib/poptI.c:70
msgid "relocations must have a / following the ="
msgstr ""
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
msgstr ""
-#: lib/poptI.c:100
+#: lib/poptI.c:110
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: lib/poptI.c:104
+#: lib/poptI.c:114
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:114
+#: lib/poptI.c:124
msgid "relocate files in non-relocateable package"
msgstr ""
-#: lib/poptI.c:117
+#: lib/poptI.c:127
msgid "save erased package files by renaming into sub-directory"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "erase (uninstall) package"
msgstr ""
-#: lib/poptI.c:120
+#: lib/poptI.c:130
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:123
+#: lib/poptI.c:133
msgid "do not install documentation"
msgstr ""
-#: lib/poptI.c:125
+#: lib/poptI.c:135
msgid "skip files with leading component <path> "
msgstr ""
-#: lib/poptI.c:126
+#: lib/poptI.c:136
msgid "<path>"
msgstr ""
-#: lib/poptI.c:129
+#: lib/poptI.c:139
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: lib/poptI.c:132
+#: lib/poptI.c:142
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
msgid "<packagefile>+"
msgstr ""
-#: lib/poptI.c:135
+#: lib/poptI.c:145
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: lib/poptI.c:138
+#: lib/poptI.c:148
msgid "don't verify package architecture"
msgstr ""
-#: lib/poptI.c:141
+#: lib/poptI.c:151
msgid "don't verify package operating system"
msgstr ""
-#: lib/poptI.c:144
+#: lib/poptI.c:154
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:146
+#: lib/poptI.c:156
msgid "install documentation"
msgstr ""
-#: lib/poptI.c:149
+#: lib/poptI.c:159
msgid "install package"
msgstr ""
-#: lib/poptI.c:151
+#: lib/poptI.c:161
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:153
+#: lib/poptI.c:163
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:156
+#: lib/poptI.c:166
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:164
+#: lib/poptI.c:174
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:167
+#: lib/poptI.c:177
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:170
+#: lib/poptI.c:180
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:173
+#: lib/poptI.c:183
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:187
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:180
+#: lib/poptI.c:190
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:183
+#: lib/poptI.c:193
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:186
+#: lib/poptI.c:196
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:199
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:203
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:207
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:199
+#: lib/poptI.c:209
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:202
+#: lib/poptI.c:212
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:213
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:216
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:219
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:212
+#: lib/poptI.c:222
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:215
+#: lib/poptI.c:225
msgid "<date>"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:227
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:220
+#: lib/poptI.c:230
msgid "upgrade package(s)"
msgstr ""
@@ -2422,7 +2431,7 @@ msgstr ""
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
msgid "failed dependencies:\n"
msgstr ""
@@ -2454,6 +2463,11 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
#: lib/rpmlead.c:50
#, c-format
msgid "read failed: %s (%d)\n"
@@ -2997,109 +3011,109 @@ msgstr ""
msgid "error(%d) counting packages\n"
msgstr ""
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""