diff options
| author | jbj <devnull@localhost> | 2002-06-28 21:54:24 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-06-28 21:54:24 +0000 |
| commit | d89ce5854d39a9e896759fb96e6e303c67573bb6 (patch) | |
| tree | 1c97bbd96403a0212535c0767abf32b987fc6484 /po | |
| parent | f5fc8957b433616cf5010e26866205985c385479 (diff) | |
| download | rpm-d89ce5854d39a9e896759fb96e6e303c67573bb6.tar.gz rpm-d89ce5854d39a9e896759fb96e6e303c67573bb6.tar.bz2 rpm-d89ce5854d39a9e896759fb96e6e303c67573bb6.zip | |
- disambiguate added/installed dependency failures (#50388).
CVS patchset: 5532
CVS date: 2002/06/28 21:54:24
Diffstat (limited to 'po')
| -rw-r--r-- | po/cs.po | 98 | ||||
| -rw-r--r-- | po/da.po | 96 | ||||
| -rw-r--r-- | po/de.po | 98 | ||||
| -rw-r--r-- | po/en_RN.po | 78 | ||||
| -rw-r--r-- | po/es.po | 78 | ||||
| -rw-r--r-- | po/eu_ES.po | 78 | ||||
| -rw-r--r-- | po/fi.po | 96 | ||||
| -rw-r--r-- | po/fr.po | 93 | ||||
| -rw-r--r-- | po/gl.po | 78 | ||||
| -rw-r--r-- | po/hu.po | 78 | ||||
| -rw-r--r-- | po/id.po | 78 | ||||
| -rw-r--r-- | po/is.po | 78 | ||||
| -rw-r--r-- | po/it.po | 78 | ||||
| -rw-r--r-- | po/ja.po | 96 | ||||
| -rw-r--r-- | po/ko.po | 98 | ||||
| -rw-r--r-- | po/no.po | 96 | ||||
| -rw-r--r-- | po/pl.po | 96 | ||||
| -rw-r--r-- | po/pt.po | 98 | ||||
| -rw-r--r-- | po/pt_BR.po | 98 | ||||
| -rw-r--r-- | po/ro.po | 78 | ||||
| -rw-r--r-- | po/rpm.pot | 78 | ||||
| -rw-r--r-- | po/ru.po | 98 | ||||
| -rw-r--r-- | po/sk.po | 96 | ||||
| -rw-r--r-- | po/sl.po | 98 | ||||
| -rw-r--r-- | po/sr.po | 96 | ||||
| -rw-r--r-- | po/sv.po | 98 | ||||
| -rw-r--r-- | po/tr.po | 97 | ||||
| -rw-r--r-- | po/uk.po | 78 | ||||
| -rw-r--r-- | po/wa.po | 78 | ||||
| -rw-r--r-- | po/zh.po | 78 | ||||
| -rw-r--r-- | po/zh_CN.GB2312.po | 78 |
31 files changed, 1323 insertions, 1415 deletions
@@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\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" @@ -1468,23 +1468,23 @@ msgstr "%s: %-45s ANO (db poskytuje)\n" msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, 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:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1492,20 +1492,20 @@ msgid "" msgstr "" "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2194,7 +2194,7 @@ msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" @@ -2446,7 +2446,7 @@ msgstr "chyba pøi vytváøení doèasného souboru %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "neinstalován " @@ -2456,7 +2456,7 @@ msgstr "neinstalován " msgid "found %d source and %d binary packages\n" msgstr "vytvoøení zdrojového a binárního balíèku z <tar_soubor>" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "chybné závislosti pøi sestavování:\n" @@ -2480,22 +2480,17 @@ msgstr "nemohu vytvoøit %s: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "Polo¾ka %s musí bıt v balíèku pøítomna: %s\n" -#: lib/rpminstall.c:704 -#, fuzzy -msgid "removing these packages would break dependencies:\n" -msgstr "dotaz/ovìøení balíèkù vy¾adujících závislost" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, fuzzy, c-format msgid "Installing %s\n" msgstr "øádek: %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2506,85 +2501,80 @@ msgid "read failed: %s (%d)\n" msgstr "%s: Fread selhalo: %s\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "balíèek %s je pro jinou architekturu" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "balíèek %s je pro jinı operaèní systém" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "cesta %s v balíèku %s není pøemístitelná" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "soubor %s zpùsobuje konflikt mezi instalovanım %s a %s" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "soubor %s z instalace %s koliduje se souborem z balíèku %s" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "balíèek %s (kterı je novìj¹í, ne¾ %s) je ji¾ nainstalován" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "instalace balíèku %s potøebuje %ld%cB na systému souborù %s" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "instalace balíèku %s potøebuje %ld inodù na systému souborù %s" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pøedtransakèní syscall v balíèku %s: %s selhalo: %s" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" +msgid "%s is needed by %s%s" +msgstr " je nutné pro %s-%s-%s\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "neinstalován " + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "balíèek %s koliduje: %s\n" +msgid "%s conflicts with %s%s" +msgstr " koliduje s %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " koliduje s %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " je nutné pro %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3408,6 +3398,18 @@ msgstr "øádek %d: Polo¾ka Epoch/Serial musí bıt èíslo: %s\n" msgid "failed to create %s: %s\n" msgstr "nemohu zjistit stav %s: %s\n" +#, fuzzy +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "dotaz/ovìøení balíèkù vy¾adujících závislost" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "balíèek %s koliduje: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "nemohu otevøít RPM databázi v %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\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" @@ -1469,42 +1469,42 @@ msgstr "%s: %-45s JA (db tilfører)\n" msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, 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:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2210,7 +2210,7 @@ msgid "can't query %s: %s\n" msgstr "kunne ikke forespørge %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" @@ -2461,7 +2461,7 @@ msgstr "fejl ved læsning fra filen %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "filen %s kræver en nyere version af RPM\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s kunne ikke installeres\n" @@ -2471,7 +2471,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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" @@ -2494,21 +2494,17 @@ msgstr "kunne ikke åbne fil %s: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" angiver flere pakker\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2519,86 +2515,81 @@ msgid "read failed: %s (%d)\n" msgstr "læsning mislykkedes: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakken %s hører til en anden arkitektur" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakken %s hører til et andet operativsystem" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "pakken %s er allerede installeret" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke omrokeres" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "filen %s skaber konflikt mellem den forsøgte installation af %s og %s" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "filen %s fra installationen af %s skaber konflikt med fil fra pakken %s" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "pakke %s (som er nyere end %s) er allerede installeret" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "installation af pakke %s kræver %ld%cb på %s-filsystemet" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "installation af pakken %s kræver %ld inode'r på %s-filsystemet" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pakke %s prætransaktion-systemkald: %s mislykkedes: %s" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" +msgid "%s is needed by %s%s" +msgstr " kræves af %s-%s-%s\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "ej installeret" + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "pakke %s skaber konflikt: %s\n" +msgid "%s conflicts with %s%s" +msgstr " skaber konflikt med %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ukendt fejl %d under arbejdet med pakken %s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " skaber konflikt med %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " kræves af %s-%s-%s\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3414,6 +3405,17 @@ msgstr "url-port skal være et tal\n" msgid "failed to create %s: %s\n" msgstr "kunne ikke oprette %s: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "pakke %s skaber konflikt: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "kan ikke åbne rpm-database i %s\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -1601,43 +1601,43 @@ msgstr "" msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # FIXME -#: lib/depends.c:953 +#: lib/depends.c:955 #, 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:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2375,7 +2375,7 @@ msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" @@ -2631,7 +2631,7 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" @@ -2641,7 +2641,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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" @@ -2665,22 +2665,17 @@ msgstr "kann Datei %s nicht öffnen: " msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" -# oder besser: "... verletzen" ? -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "Es wurden keine Pakete für die Deinstallation angegeben" @@ -2691,89 +2686,84 @@ msgid "read failed: %s (%d)\n" msgstr "lesen fehlgeschlagen: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " steht im Konflikt mit %s-%s-%s\n" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "Paket %s wird nicht in %s aufgeführt" +msgid "%s is needed by %s%s" +msgstr " wird von %s-%s-%s gebraucht\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "Paket %s ist nicht installiert\n" + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "Paket %s wird nicht in %s aufgeführt" +msgid "%s conflicts with %s%s" +msgstr " steht im Konflikt mit %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " steht im Konflikt mit %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " wird von %s-%s-%s gebraucht\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3616,6 +3606,18 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" +# oder besser: "... verletzen" ? +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "Paket %s wird nicht in %s aufgeführt" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "Paket %s wird nicht in %s aufgeführt" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" diff --git a/po/en_RN.po b/po/en_RN.po index 560037500..f9150b18c 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/eu_ES.po b/po/eu_ES.po index 560037500..f9150b18c 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -1492,42 +1492,42 @@ msgstr "" msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2256,7 +2256,7 @@ msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" @@ -2507,7 +2507,7 @@ msgstr "virhe luotaessa hakemistoa %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" @@ -2517,7 +2517,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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" @@ -2541,21 +2541,17 @@ msgstr "en voinut avata tiedostoa %s: " msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "poistolle ei määritelty paketteja" @@ -2566,85 +2562,80 @@ msgid "read failed: %s (%d)\n" msgstr "luku epäonnistui: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "paketti %s ei ole %s:ssä" +msgid "%s is needed by %s%s" +msgstr "vaatii %s-%s-%s\n" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "paketti %s ei ole asennettu\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "paketti %s ei ole %s:ssä" +msgid "%s conflicts with %s%s" +msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr "vaatii %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3475,6 +3466,17 @@ msgstr "virhe: ftpport pitää olla luku\n" msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "paketti %s ei ole %s:ssä" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "paketti %s ei ole %s:ssä" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "virhe: en voi avata %s%s/packages.rpm\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1522,42 +1522,42 @@ msgstr "" msgid "(db package)" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2301,7 +2301,7 @@ msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" @@ -2551,7 +2551,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2561,7 +2561,7 @@ msgstr "aucun package n'a t spcifi pour l'installation" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "impossible d'ouvrir: %s\n" @@ -2584,21 +2584,17 @@ msgstr "impossible d'ouvrir: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "aucun package n'a t spcifi pour la dsinstallation" @@ -2609,83 +2605,80 @@ msgid "read failed: %s (%d)\n" msgstr "impossible d'ouvrir: %s\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 -#, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" +#: lib/rpmps.c:262 +#, c-format +msgid "%s is needed by %s%s" +msgstr "" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +msgid "%s conflicts with %s%s" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -msgid "conflicts with" -msgstr "" - -#: lib/rpmps.c:370 -msgid "is needed by" -msgstr "" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3501,6 +3494,14 @@ msgid "failed to create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "aucun package n'a t spcifi pour l'installation" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "aucun package n'a t spcifi pour la dsinstallation" + +#, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "impossible d'ouvrir: %s\n" @@ -3812,10 +3813,6 @@ msgstr "impossible d'ouvrir: %s\n" #~ msgstr "aucun package n'a t spcifi pour l'installation" #, fuzzy -#~ msgid "package %s conflicts: %s\n" -#~ msgstr "aucun package n'a t spcifi pour la dsinstallation" - -#, fuzzy #~ msgid "%s: read manifest failed: %s\n" #~ msgstr "impossible d'ouvrir: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\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" @@ -1433,42 +1433,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2132,7 +2132,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2378,7 +2378,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2388,7 +2388,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2410,21 +2410,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2435,81 +2431,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\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" @@ -1441,42 +1441,42 @@ msgstr "" msgid "(db package)" msgstr "uppfæra pakka" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2151,7 +2151,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2397,7 +2397,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2407,7 +2407,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "gat ekki útbúiğ pakkaskilyrği:\n" @@ -2430,21 +2430,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2455,81 +2451,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -1517,42 +1517,42 @@ msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n" msgid "(db package)" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Ş¤·¤¿\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2293,7 +2293,7 @@ msgid "can't query %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤¤Ş¤»¤ó: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" @@ -2547,7 +2547,7 @@ msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹ş¤ß¥¨¥é¡¼ " msgid "file %s requires a newer version of RPM\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ğ¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Ş¤»¤ó\n" @@ -2557,7 +2557,7 @@ msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Ş¤»¤ó\n" msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ğ¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Ş¤·¤¿\n" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "°Í¸À¤Î·çÇ¡:\n" @@ -2580,21 +2580,17 @@ msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Ş¤»¤ó: %s" msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Ş¤¹\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À¤òÇ˲õ¤·¤Ş¤¹:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Ş¤»¤ó\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2605,94 +2601,89 @@ msgid "read failed: %s (%d)\n" msgstr "Æɤ߹ş¤ß¤Î¼ºÇÔ: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥¥Æ¥¯¥Á¥ã¸ş¤±¤Ç¤¹" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸ş¤±¤Ç¤¹" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ¤Ş¤»¤ó" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, fuzzy, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" "¥Õ¥¡¥¤¥ë %s ¤Ï %s-%s-%s ¤È %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Ş¤¹" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "%s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤«¤é¤Î¥Õ¥¡¥¤¥ë %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤«¤é¤Î¥Õ¥¡¥¤¥ë" "¤È¶¥¹ç¤·¤Æ¤¤¤Ş¤¹" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş" "¤¹" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n" +msgid "%s is needed by %s%s" +msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Ş¤¹\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó" + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤¹: %s\n" +msgid "%s conflicts with %s%s" +msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Ş¤¹\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤¤Ş¤·¤¿" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Ş¤¹\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Ş¤¹\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3525,6 +3516,17 @@ msgstr "url ¥İ¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó\n" msgid "failed to create %s: %s\n" msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À¤òÇ˲õ¤·¤Ş¤¹:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤¹: %s\n" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Ş¤»¤ó\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n" "Language-Team: GNU Translation project <ko@li.org>\n" @@ -1454,23 +1454,23 @@ msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" msgid "(db package)" msgstr "ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "´ÙÀ½°ú °ü·ÃµÈ ÆĞÅ°Áö À̸§À» ¹«½ÃÇÕ´Ï´Ù [%d]\t%s -> %s\n" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼ %s-%s-%s \"%s\"(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1478,20 +1478,20 @@ msgstr "" "========== ÆĞÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, Æ®¸®, ±íÀÌ" "[depth])\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ¸¸ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2183,7 +2183,7 @@ msgid "can't query %s: %s\n" msgstr "%s(À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "%s(À»)¸¦ ¿©´Âµ¥ ½ÇÆĞÇÔ: %s\n" @@ -2434,7 +2434,7 @@ msgstr "%s ÆÄÀÏÀ» ÀĞ´Â µµÁß ¿À·ù°¡ ¹ß»ıÇß½À´Ï´Ù\n" msgid "file %s requires a newer version of RPM\n" msgstr "%s ÆÄÀÏÀº ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s(Àº)´Â ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" @@ -2444,7 +2444,7 @@ msgstr "%s(Àº)´Â ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" msgid "found %d source and %d binary packages\n" msgstr "%dÀÇ ¼Ò½º¿Í %dÀÇ ¹ÙÀ̳ʸ® ÆĞÅ°Áö°¡ °Ë»öµÇ¾ú½À´Ï´Ù\n" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆĞÇÔ:\n" @@ -2467,21 +2467,17 @@ msgstr "%s ÆÄÀÏÀ» ¿ ¼ö ¾øÀ½: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¿©·¯°³ÀÇ ÆĞÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "ÀÌ ÆĞÅ°ÁöµéÀ» Á¦°ÅÇÒ °æ¿ì ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "%s(À»)¸¦ ¿ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "%s(À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "(+%d,-%d) ÆĞÅ°Áö¸¦ %sÀ¸·Î ·Ñ¹é(rollback)ÇÕ´Ï´Ù" @@ -2492,91 +2488,86 @@ msgid "read failed: %s (%d)\n" msgstr "Àдµ¥ ½ÇÆĞÇÔ: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "%s(Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "%s(Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "%s ÆĞÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%2$s ÆĞÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%2$s(¿Í)°ú %3$sÀÇ ¼³Ä¡ °úÁ¤¿¡¼ %1$s ÆÄÀÏÀÌ ¼·Î Ãæµ¹ÇÕ´Ï´Ù" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "%2$s¿¡¼ ¼³Ä¡µÇ´Â %1$s ÆÄÀÏÀº %3$s ÆĞÅ°ÁöÀÇ ÆÄÀÏ°ú Ãæµ¹ÇÕ´Ï´Ù" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s ÆĞÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆĞÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" "%4$s ÆÄÀϽýºÅÛ »ó¿¡¼ %1$s ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld%3$cb(ÀÌ)°¡ ÇÊ¿äÇÕ" "´Ï´Ù" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "%3$s ÆÄÀϽýºÅÛ »ó¿¡¼ %1$s ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ldÀÇ ¾ÆÀ̳ëµå(inode)" "°¡ ÇÊ¿äÇÕ´Ï´Ù" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" "%s ÆĞÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄİ(syscall): %s(ÀÌ)°¡ ½ÇÆĞÇß½À´Ï´Ù: %s" -#: lib/rpmps.c:280 -#, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" +#: lib/rpmps.c:262 +#, fuzzy, c-format +msgid "%s is needed by %s%s" +msgstr " (Àº)´Â %s-%s-%s ¿¡¼ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "%s ÆĞÅ°ÁöÀÇ Ãæµ¹»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "¼³Ä¡µÇ¾î ÀÖÁö ¾ÊÀ½ " + +#: lib/rpmps.c:267 +#, fuzzy, c-format +msgid "%s conflicts with %s%s" +msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" "%2$s ÆĞÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d(ÀÌ)°¡ ¹ß»ıÇß½À´Ï´Ù" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " (Àº)´Â %s-%s-%s ¿¡¼ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3393,6 +3384,15 @@ msgstr "URL Æ÷Æ®´Â ¹İµå½Ã ¼ıÀÚÀ̾î¾ß ÇÕ´Ï´Ù\n" msgid "failed to create %s: %s\n" msgstr "%s(À»)¸¦ »ı¼ºÇϴµ¥ ½ÇÆĞÇÔ: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "ÀÌ ÆĞÅ°ÁöµéÀ» Á¦°ÅÇÒ °æ¿ì ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n" + +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" + +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "%s ÆĞÅ°ÁöÀÇ Ãæµ¹»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "%sÀÇ rpm µ¥ÀÌÅͺ£À̽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\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" @@ -1456,42 +1456,42 @@ msgstr "" msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2174,7 +2174,7 @@ msgid "can't query %s: %s\n" msgstr "kan ikke spørre på %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under åpning av %s: %s\n" @@ -2420,7 +2420,7 @@ msgstr "feil under lesing fra fil %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "fil %s trenger en nyere versjon av RPM\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2430,7 +2430,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "feilede avhengigheter:\n" @@ -2453,21 +2453,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke åpne %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2478,85 +2474,80 @@ msgid "read failed: %s (%d)\n" msgstr "lesing feilet: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakke %s er for en annen arkitektur" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakke %s er for et annet operativsystem" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "pakke %s er allerede installert" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke relokeres" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "pakke %s er i konflikt: %s\n" +msgid "%s is needed by %s%s" +msgstr " kreves av %s-%s-%s\n" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "ikke installert" -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "pakke %s er i konflikt: %s\n" +msgid "%s conflicts with %s%s" +msgstr " er i konflikt med %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " er i konflikt med %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " kreves av %s-%s-%s\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3363,6 +3354,17 @@ msgstr "url-port må være et tall\n" msgid "failed to create %s: %s\n" msgstr "kunne ikke opprette %s: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "pakke %s er i konflikt: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "pakke %s er i konflikt: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "kan ikke åpne database i %s\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -1499,42 +1499,42 @@ msgstr "Udostêpniane zasoby:" msgid "(db package)" msgstr "znaleziono %d pakietów\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2256,7 +2256,7 @@ msgid "can't query %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" @@ -2507,7 +2507,7 @@ msgstr "b³±d czytania z pliku %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie mo¿e byæ zainstalowany\n" @@ -2517,7 +2517,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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "niespe³nione zale¿no¶ci:\n" @@ -2540,21 +2540,17 @@ msgstr "nie mo¿na otworzyæ pliku %s: %s" msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" okre¶la wiele pakietów\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2565,87 +2561,82 @@ msgid "read failed: %s (%d)\n" msgstr "odczyt nie powiód³ siê: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakiet %s-%s-%s zbudowano dla innej architektury" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "plik %s z pakietu %s-%s-%s jest w konflikcie z plikiem z pakietu %s-%s-%s" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "pakiet %s-%s-%s (który jest nowszy ni¿ %s-%s-%s) jest ju¿ zainstalowany" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" +msgid "%s is needed by %s%s" +msgstr " jest wymagany przez %s-%s-%s\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "niezainstalowany" + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "pakiet %s jest w konflikcie: %s\n" +msgid "%s conflicts with %s%s" +msgstr " jest w konflikcie z %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "wyst±pi³ nieznany b³±d %d w trakcie manipulowania pakietem %s-%s-%s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " jest w konflikcie z %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " jest wymagany przez %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3468,6 +3459,17 @@ msgstr "port musi byæ liczb±\n" msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "pakiet %s jest w konflikcie: %s\n" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n" "Language-Team: pt <morais@kde.org\n" @@ -1470,43 +1470,43 @@ msgstr "%s: %-45s SI (oferecidos pelo db)\n" msgid "(db package)" msgstr "nenhum pacote\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "ignorar relações entre o nome do pacote [%d]\t%s -> %s\n" -#: lib/depends.c:953 +#: lib/depends.c:955 #, 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:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" "========== ordenar pacotes (order, #predecessors, #succesors, tree, depth)\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2195,7 +2195,7 @@ msgid "can't query %s: %s\n" msgstr "não consigo pesquisar o %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "o acesso ao %s falhou: %s\n" @@ -2446,7 +2446,7 @@ msgstr "erro ao ler do ficheiros %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "o %s precisa duma versão mais recente do RPM\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "o %s não pode ser instalado\n" @@ -2456,7 +2456,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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "dependências falhadas:\n" @@ -2479,21 +2479,17 @@ msgstr "não consigo aceder ao ficheiro %s: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "o \"%s\" especifica vários pacotes\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "a remoção destes pacotes irá quebrar dependências:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "não consigo aceder ao %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "A instalar o %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "a efectuar o 'rollback' (+%d,-%d) pacotes para %s" @@ -2504,89 +2500,84 @@ msgid "read failed: %s (%d)\n" msgstr "a leitura falhou: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "o pacote %s é para uma arquitectura diferente" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "o pacote %s é para um sistema operativo diferente" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "o pacote %s já está instalado" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "a directoria %s no pacote %s não pode ser mudada de sítio" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" "o ficheiro %s está em conflito com as tentativas de instalação do %s e %s" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "o ficheiro %s da instalação do %s está em conflito com o ficheiro do pacote %" "s" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "o pacote %s (que é mais recente que o %s) já está instalado" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "a instalação do pacote %s precisa de %ld%cb no sistema de ficheiros %s" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "a instalação do pacote %s precisa de %ld 'inodes' no sistema de ficheiros %s" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "a(s) chamada(s) de pré-transacção do pacote %s: %s falhou: %s" -#: lib/rpmps.c:280 -#, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "o pacote %s tem requisitos não satisfeitos: %s\n" +#: lib/rpmps.c:262 +#, fuzzy, c-format +msgid "%s is needed by %s%s" +msgstr " é necessário pelo %s-%s-%s\n" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "o pacote %s tem campos Conflits não satisfeitos: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "não instalado " + +#: lib/rpmps.c:267 +#, fuzzy, c-format +msgid "%s conflicts with %s%s" +msgstr " está em conflito com o %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " está em conflito com o %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " é necessário pelo %s-%s-%s\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3398,6 +3389,15 @@ 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 "removing these packages would break dependencies:\n" +#~ msgstr "a remoção destes pacotes irá quebrar dependências:\n" + +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "o pacote %s tem requisitos não satisfeitos: %s\n" + +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "o pacote %s tem campos Conflits não satisfeitos: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "não consigo a base de dados do RPM em %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3f3bb03f5..092bc159c 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" #: build.c:40 #, fuzzy @@ -1610,43 +1610,43 @@ msgstr "" msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # , c-format -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2385,7 +2385,7 @@ msgid "can't query %s: %s\n" msgstr "No consegui abrir: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construo falhou.\n" @@ -2651,7 +2651,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "no foi passado pacote para instalao" @@ -2661,7 +2661,7 @@ msgstr "no foi passado pacote para instalao" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "lista dependncias do pacote" @@ -2686,23 +2686,18 @@ msgstr "No consegui abrir: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -#, fuzzy -msgid "removing these packages would break dependencies:\n" -msgstr "lista dependncias do pacote" - # , c-format -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "no foi passado pacote para desinstalao" @@ -2714,83 +2709,80 @@ msgid "read failed: %s (%d)\n" msgstr "No consegui abrir: %s\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 -#, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" +#: lib/rpmps.c:262 +#, c-format +msgid "%s is needed by %s%s" +msgstr "" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +msgid "%s conflicts with %s%s" msgstr "no foi passado pacote para desinstalao" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -msgid "conflicts with" -msgstr "" - -#: lib/rpmps.c:370 -msgid "is needed by" -msgstr "" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3648,6 +3640,18 @@ msgstr "" msgid "failed to create %s: %s\n" msgstr "No consegui abrir o pipe tar: %s\n" +#, fuzzy +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "lista dependncias do pacote" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "no foi passado pacote para instalao" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "no foi passado pacote para desinstalao" + # , c-format #, fuzzy #~ msgid "cannot open rpm database in %s\n" @@ -4199,10 +4203,6 @@ msgstr "No consegui abrir o pipe tar: %s\n" #~ msgstr "no foi passado pacote para instalao" #, fuzzy -#~ msgid "package %s conflicts: %s\n" -#~ msgstr "no foi passado pacote para desinstalao" - -#, fuzzy #~ msgid "rpm verify mode (legacy)" #~ msgstr "modo pesquisa" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -1433,42 +1433,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2132,7 +2132,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2378,7 +2378,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2388,7 +2388,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2410,21 +2410,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2435,81 +2431,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/rpm.pot b/po/rpm.pot index a9ad29412..268e8673a 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1439,42 +1439,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2138,7 +2138,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2384,7 +2384,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2394,7 +2394,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2416,21 +2416,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2441,81 +2437,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2002-04-09 16:44-0400\n" "Last-Translator: Eugene Kanter, <eugene@bcl.bz>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -1476,23 +1476,23 @@ msgstr "%s: %-45s YES (db provides)\n" msgid "(db package)" msgstr "ÎÅÔ ĞÁËÅÔÏ×\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== ÚÁĞÉÓØ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1500,20 +1500,20 @@ msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ĞÁËÅÔÏ× (ÏŞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÄÅÒÅ×Ï, ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ĞÏÓÌÅÄÏ×ÁÔÅÌÉ (× ĞÏÒÑÄËÅ ĞÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== ĞÒÏÄÏÌÖÅÎÉÅ ÕĞÏÒÑÄÏŞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2197,7 +2197,7 @@ msgid "can't query %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁĞÒÏÓÉÔØ %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" @@ -2447,7 +2447,7 @@ msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2457,7 +2457,7 @@ msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" msgid "found %d source and %d binary packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ĞÁËÅÔÏ×\n" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" @@ -2480,21 +2480,17 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ĞÁËÅÔÏ×\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ĞÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "ÏÔËÁÔÉÔØ (+%d,-%d) ĞÁËÅÔÙ Ë %s" @@ -2505,86 +2501,81 @@ msgid "read failed: %s (%d)\n" msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏĞÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "ĞÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "ĞÕÔØ %s × ĞÁËÅÔÅ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ĞÒÉ ĞÏĞÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "ÆÁÊÌ %s ÉÚ ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÏÇÏ ĞÁËÅÔÁ %s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ĞÁËÅÔÁ %s" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "ĞÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ŞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "ĞÁËÅÔ %s pre-transaction syscall(s): %s: ÏÛÉÂËÁ: %s" -#: lib/rpmps.c:280 -#, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "ĞÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÔÒÅÂÏ×ÁÎÉÑ: %s\n" +#: lib/rpmps.c:262 +#, fuzzy, c-format +msgid "%s is needed by %s%s" +msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "ĞÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ëÏÎÆÌÉËÔÙ: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎ " + +#: lib/rpmps.c:267 +#, fuzzy, c-format +msgid "%s conflicts with %s%s" +msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ĞÒÉ ÒÁÂÏÔÅ Ó ĞÁËÅÔÏÍ %s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3397,6 +3388,15 @@ msgstr "url ĞÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ŞÉÓÌÏÍ\n" msgid "failed to create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ĞÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" + +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "ĞÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÔÒÅÂÏ×ÁÎÉÑ: %s\n" + +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "ĞÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ëÏÎÆÌÉËÔÙ: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ RPM × %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -1497,42 +1497,42 @@ msgstr "Poskytuje:" msgid "(db package)" msgstr "nájdenıch %d balíkov\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, 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:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2254,7 +2254,7 @@ msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" @@ -2505,7 +2505,7 @@ msgstr "chyba pri vytváraní doèasného súboru %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je mo¾né nain¹talova»\n" @@ -2515,7 +2515,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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" @@ -2538,21 +2538,17 @@ msgstr "nie je mo¾né otvori» súbor %s: %s" msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¹pecifikuje viac balíkov\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "odstránenie tıchto balíkov by poru¹ilo závislosti:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2563,85 +2559,80 @@ msgid "read failed: %s (%d)\n" msgstr "èítanie zlyhalo: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" +msgid "%s is needed by %s%s" +msgstr " je vy¾adované %s-%s-%s\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "nein¹talovanı " + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "balík %s koliduje: %s\n" +msgid "%s conflicts with %s%s" +msgstr " koliduje s %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " koliduje s %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " je vy¾adované %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3464,6 +3455,17 @@ msgstr "url port musí by» èíslo\n" msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "odstránenie tıchto balíkov by poru¹ilo závislosti:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "balík %s koliduje: %s\n" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "nie je mo¾né otvori» %s/packages.rpm\n" @@ -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.265 2002/06/28 13:05:38 jbj Exp $ +# $Id: sl.po,v 1.266 2002/06/28 21:55:12 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -1500,42 +1500,42 @@ msgstr "%s: %-45s DA (db ponudbe)\n" msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2254,7 +2254,7 @@ msgid "can't query %s: %s\n" msgstr "ni mo¾no poizvedeti o %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" @@ -2507,7 +2507,7 @@ msgstr "napaka pri branju iz datoteke %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "datoteka %s zahteva novej¹o razlièico RPM\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni mo¾no namestiti\n" @@ -2517,7 +2517,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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "neuspe¹ne soodvisnosti:\n" @@ -2540,21 +2540,17 @@ msgstr "ni mo¾no odpreti datoteke %s: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" doloèa veè paketov\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "ni mo¾no odpreti %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Name¹èanje %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2565,86 +2561,81 @@ msgid "read failed: %s (%d)\n" msgstr "branje je bilo neuspe¹no: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s-%s-%s je za drug tip arhitekture" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s-%s-%s je za drug operacijski sistem" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketa %s ni mo¾no prestaviti\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, fuzzy, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "datoteka %s je v sporu med poskusom namestitve %s in %s" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "datoteka %s name¹èena z %s-%s-%s je v sporu z datoteko iz paketa %s-%s-%s" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s-%s-%s (ki je novej¹i kot %s-%s-%s) je ¾e name¹èen" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datoteènem sistemu %s" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "paket %s pred-prenosljivih sistemskih klicov: %s ni uspelo: %s" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" +msgid "%s is needed by %s%s" +msgstr " potrebuje %s-%s-%s\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "ni name¹èeno " + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "paket %s jw v sporu z: %s\n" +msgid "%s conflicts with %s%s" +msgstr " je v sporu z %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " je v sporu z %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " potrebuje %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3471,6 +3462,17 @@ msgstr "vrata URL morajo biti ¹tevilka\n" msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "paket %s jw v sporu z: %s\n" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "datoteke %s/packages.rpm ni mogo¾no odpreti\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -1485,42 +1485,42 @@ msgstr "" msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, 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:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2247,7 +2247,7 @@ msgid "can't query %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" @@ -2498,7 +2498,7 @@ msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "gre¹ka: %s se ne mo¾e instalirati\n" @@ -2508,7 +2508,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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "lo¹e meğuzavisnosti:\n" @@ -2532,21 +2532,17 @@ msgstr "Ne mogu da otvorim datoteku %s: " msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" odreğuje vi¹e paketa\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "neodstaje paket za deinstalaciju" @@ -2557,85 +2553,80 @@ msgid "read failed: %s (%d)\n" msgstr "neuspelo èitanje: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s nije instaliran\n" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paket %s nije instaliran\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " se sudara sa %s-%s-%s\n" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "paket %s nije naveden u %s" +msgid "%s is needed by %s%s" +msgstr " je potreban paketu %s-%s-%s\n" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "paket %s nije instaliran\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "paket %s nije naveden u %s" +msgid "%s conflicts with %s%s" +msgstr " se sudara sa %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " se sudara sa %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " je potreban paketu %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3466,6 +3457,17 @@ msgstr "gre¹ka: FTP port mora biti broj\n" msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "paket %s nije naveden u %s" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "paket %s nije naveden u %s" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2002-02-18 21:13+0100\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -1461,23 +1461,23 @@ msgstr "%s: %-45s JA (db-tillhandahållande)\n" msgid "(db package)" msgstr "inga paket\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "ignorera paketnamnsrelation(er) [%d]\t%s -> %s\n" -#: lib/depends.c:953 +#: lib/depends.c:955 #, 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:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1485,20 +1485,20 @@ msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, träd, " "djup)\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2181,7 +2181,7 @@ msgid "can't query %s: %s\n" msgstr "kan inte fråga %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" @@ -2431,7 +2431,7 @@ msgstr "fel vid läsning från fil %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "filen %s behöver en nyare version av RPM\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" @@ -2441,7 +2441,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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "ouppfyllda beroenden:\n" @@ -2464,21 +2464,17 @@ msgstr "kan inte öppna filen %s: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "återställer (+%d,-%d) paket till %s" @@ -2489,85 +2485,80 @@ msgid "read failed: %s (%d)\n" msgstr "läsning misslyckades: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s är för en annan arkitektur" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s är för ett annat operativsystem" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "paket %s är redan installerat" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sökväg %s i paket %s är inte relokerbar" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "fil %s är en konflikt mellan installationsförsök av %s och %s" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "fil %s från installation av %s står i konflikt med filen från paket %s" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s (som är nyare än %s) är redan installerat" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "installation av paket %s kräver %ld%cB på filsystem %s" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "installation av paket %s kräver %ld inoder på filsystem %s" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s systemanrop före transaktion: %s misslyckades: %s" -#: lib/rpmps.c:280 -#, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "paket %s har ouppfyllda Requires: %s\n" +#: lib/rpmps.c:262 +#, fuzzy, c-format +msgid "%s is needed by %s%s" +msgstr " behövs av %s-%s-%s\n" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "paket %s har ouppfyllda Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "oinstallerat " + +#: lib/rpmps.c:267 +#, fuzzy, c-format +msgid "%s conflicts with %s%s" +msgstr " står i konflikt med %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "okänt fel %d uppträdde under behandling av paket %s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " står i konflikt med %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " behövs av %s-%s-%s\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3377,6 +3368,15 @@ msgstr "url-port måste vara ett tal\n" msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n" + +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "paket %s har ouppfyllda Requires: %s\n" + +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "paket %s har ouppfyllda Conflicts: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "kan inte öppna rpmdatabas i %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\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" @@ -1482,23 +1482,23 @@ msgstr "%s: %-45s EVET (db sağlar)\n" msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, 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:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== tsort bağıntıları kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1506,20 +1506,20 @@ msgid "" msgstr "" "========== paketler tsort'lanıyor (sıra, #öncüller, #ardıllar, derinlik)\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardıllar (sunum sırası)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "ÇEVRİM:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2214,7 +2214,7 @@ msgid "can't query %s: %s\n" msgstr "%s sorgulanamıyor: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açılamadı: %s\n" @@ -2464,7 +2464,7 @@ msgstr "%s dosyasından okuma hatalı\n" msgid "file %s requires a newer version of RPM\n" msgstr "%s dosyası RPM'nin daha yeni bir sürümünü gerektiriyor\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s yüklenemedi\n" @@ -2474,7 +2474,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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "bağımlılıklarda hata; gerekli paketler:\n" @@ -2497,21 +2497,17 @@ msgstr "%s dosyası açılamadı: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanımlıyor\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "bu paketin silinmesi aşağıdakilerin bağımlılıklarını etkileyecektir:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "%s açılamadı: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "%s kuruluyor\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2522,85 +2518,80 @@ msgid "read failed: %s (%d)\n" msgstr "okuma başarısız: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "%s farklı bir mimari için" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "%s farklı bir işletim sistemi için" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "%s zaten kurulu" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%s dosya yolu %s paketinde yeniden konumlandırılamaz" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%s dosyası kalkışılan %s ve %s kurulumları arasında çelişiyor" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "%s dosyasının %s kurulumu %s kurulumundaki dosya ile çelişiyor" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s paketi zaten yüklü (%s sürümünden daha yeni)" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "%s kurulumu %ld i-düğüm gerektiriyor (%s dosya sisteminde)" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "%s işlem öncesi sistem çağrı(sı/ları): %s başarısız: %s" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n" +msgid "%s is needed by %s%s" +msgstr " %s-%s-%s için gerekli\n" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "yüklenmedi " -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "%s paketi çelişiyor: %s\n" +msgid "%s conflicts with %s%s" +msgstr " %s-%s-%s ile çelişiyor\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "anlaşılamayan %d hatası, %s paketi işlenirken saptandı" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " %s-%s-%s ile çelişiyor\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " %s-%s-%s için gerekli\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3410,6 +3401,18 @@ msgstr "url portu bir sayı olmalı\n" msgid "failed to create %s: %s\n" msgstr "%s oluşturulamadı: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "" +#~ "bu paketin silinmesi aşağıdakilerin bağımlılıklarını etkileyecektir:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "%s paketi çelişiyor: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "%s dizininde rpm veritabanı açılamıyor\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 560037500..f9150b18c 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 |