diff options
| author | jbj <devnull@localhost> | 2001-11-09 17:22:08 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2001-11-09 17:22:08 +0000 |
| commit | ac15c68ca55ee520177bfb0e1576b1069d9fbccf (patch) | |
| tree | 0aef901b6c73ef250f494e90f87fe6718aae2d3d /po | |
| parent | eb10f05b8587e931bd261e99241cac2b8649d4dc (diff) | |
| download | librpm-tizen-ac15c68ca55ee520177bfb0e1576b1069d9fbccf.tar.gz librpm-tizen-ac15c68ca55ee520177bfb0e1576b1069d9fbccf.tar.bz2 librpm-tizen-ac15c68ca55ee520177bfb0e1576b1069d9fbccf.zip | |
- no-brainer refcounts for rpmProblemSet object.
CVS patchset: 5163
CVS date: 2001/11/09 17:22:08
Diffstat (limited to 'po')
| -rw-r--r-- | po/cs.po | 131 | ||||
| -rw-r--r-- | po/da.po | 131 | ||||
| -rw-r--r-- | po/de.po | 127 | ||||
| -rw-r--r-- | po/en_RN.po | 121 | ||||
| -rw-r--r-- | po/es.po | 121 | ||||
| -rw-r--r-- | po/eu_ES.po | 121 | ||||
| -rw-r--r-- | po/fi.po | 127 | ||||
| -rw-r--r-- | po/fr.po | 121 | ||||
| -rw-r--r-- | po/gl.po | 121 | ||||
| -rw-r--r-- | po/hu.po | 121 | ||||
| -rw-r--r-- | po/id.po | 121 | ||||
| -rw-r--r-- | po/is.po | 121 | ||||
| -rw-r--r-- | po/it.po | 121 | ||||
| -rw-r--r-- | po/ja.po | 127 | ||||
| -rw-r--r-- | po/ko.po | 131 | ||||
| -rw-r--r-- | po/no.po | 131 | ||||
| -rw-r--r-- | po/pl.po | 127 | ||||
| -rw-r--r-- | po/pt.po | 131 | ||||
| -rw-r--r-- | po/pt_BR.po | 121 | ||||
| -rw-r--r-- | po/ro.po | 121 | ||||
| -rw-r--r-- | po/rpm.pot | 121 | ||||
| -rw-r--r-- | po/ru.po | 131 | ||||
| -rw-r--r-- | po/sk.po | 127 | ||||
| -rw-r--r-- | po/sl.po | 129 | ||||
| -rw-r--r-- | po/sr.po | 127 | ||||
| -rw-r--r-- | po/sv.po | 131 | ||||
| -rw-r--r-- | po/tr.po | 131 | ||||
| -rw-r--r-- | po/uk.po | 121 | ||||
| -rw-r--r-- | po/wa.po | 121 | ||||
| -rw-r--r-- | po/zh.po | 121 | ||||
| -rw-r--r-- | po/zh_CN.GB2312.po | 121 |
31 files changed, 2015 insertions, 1860 deletions
@@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -831,7 +831,7 @@ msgstr "Nemohu přečíst hlavičku z %s: %s\n" msgid "Could not open %s: %s\n" msgstr "Nemohu otevřít %s: %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "Nemohu zapsat balíček: %s\n" @@ -861,7 +861,7 @@ msgstr "Nemohu přečíst payload z %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Nemohu zapsat payload do %s: %s\n" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -1629,7 +1629,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "Počet dataLength() RPM_STRING_TYPE musí být 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "Datový typ %d není podporován\n" @@ -2150,183 +2150,188 @@ msgstr "podepsat balíček (zahodit aktuální podpis)" msgid "generate signature" msgstr "generovat PGP/GPG podpis" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " koliduje s %s-%s-%s\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " je nutné pro %s-%s-%s\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 -#, c-format -msgid "package %s is for a different architecture" +#: lib/problems.c:237 +#, fuzzy, c-format +msgid "package %s is intended for a %s architecture" msgstr "balíček %s je pro jinou architekturu" -#: lib/problems.c:249 -#, c-format -msgid "package %s is for a different operating system" +#: lib/problems.c:242 +#, 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/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "balíček %s je již nainstalován" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "cesta %s v balíčku %s není přemístitelná" -#: lib/problems.c:264 +#: lib/problems.c:257 #, 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/problems.c:269 +#: lib/problems.c:262 #, 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/problems.c:274 +#: lib/problems.c:267 #, 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/problems.c:279 +#: lib/problems.c:272 #, 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/problems.c:289 +#: lib/problems.c:282 #, 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/problems.c:294 +#: lib/problems.c:287 #, 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/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, 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/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " koliduje s %s-%s-%s\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " je nutné pro %s-%s-%s\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "========== relokace\n" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "%5d vynechávám %s\n" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d přemísťuji %s -> %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "vynechávám multilib cestu %s%s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "vynechávám %s %s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "přemísťuji %s do %s\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "přemísťuji adresář %s do %s\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "nemohu vytvořit %s: %s\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "nemohu zapsat do %%%s %s\n" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "očekávám balíček se zdrojovými kódy, nalezen však binární\n" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "zdrojový balíček neobsahuje .spec soubor\n" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: spouštím %s skript(y) (pokud existují)\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "provedení skripletu %s z %s-%s-%s selhalo, návratový kód byl: %s\n" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s obsahuje %d souborů, test = %d\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: scriptlet %s selhal (%d), přeskakuji %s-%s-%s\n" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "uživatel %s neexistuje - použit uživatel root\n" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - použita skupina root\n" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr " na souboru " -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevřít %s: %s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" @@ -2375,7 +2380,7 @@ msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "otevření %s selhalo: %s\n" @@ -2448,7 +2453,7 @@ msgstr "záznam balíčku číslo: %u\n" msgid "record %u could not be read\n" msgstr "záznam %d nelze přečíst\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "balíček %s není nainstalován\n" @@ -2542,7 +2547,7 @@ msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n" @@ -2587,7 +2592,7 @@ msgstr "chyba při čtení ze souboru %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "soubor %s vyžaduje novější verzi RPM\n" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "%s nemůže být nainstalován\n" @@ -2605,26 +2610,26 @@ msgstr "nevyřešené závislosti:\n" msgid "installing binary packages\n" msgstr "instaluji binární balíčky\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "nemohu otevřít soubor %s: %s\n" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" určuje více balíčků\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "odstranění těchto balíčků by porušilo závislosti:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "nemohu otevřít %s: %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "Instaluji %s\n" @@ -2875,13 +2880,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s přeskočeno, protože chybí příznak\n" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresář %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -828,7 +828,7 @@ msgstr "Kunne ikke lćse hoved fra %s: %s\n" msgid "Could not open %s: %s\n" msgstr "Kunne ikke ĺbne %s: %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -858,7 +858,7 @@ msgstr "Kunne ikke lćse pakkeindhold fra %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1629,7 +1629,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE-antal skal vćre 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d understřttes ikke\n" @@ -2168,186 +2168,191 @@ msgstr "underskriv en pakke (slet nuvćrende signatur)" msgid "generate signature" msgstr "generér PGP/GPG-signatur" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " skaber konflikt med %s-%s-%s\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " krćves af %s-%s-%s\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 -#, c-format -msgid "package %s is for a different architecture" +#: lib/problems.c:237 +#, fuzzy, c-format +msgid "package %s is intended for a %s architecture" msgstr "pakken %s hřrer til en anden arkitektur" -#: lib/problems.c:249 -#, c-format -msgid "package %s is for a different operating system" +#: lib/problems.c:242 +#, fuzzy, c-format +msgid "package %s is intended for a %s operating system" msgstr "pakken %s hřrer til et andet operativsystem" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "pakken %s er allerede installeret" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke omrokeres" -#: lib/problems.c:264 +#: lib/problems.c:257 #, 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/problems.c:269 +#: lib/problems.c:262 #, 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/problems.c:274 +#: lib/problems.c:267 #, 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/problems.c:279 +#: lib/problems.c:272 #, 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/problems.c:289 +#: lib/problems.c:282 #, 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/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pakke %s prćtransaktion-systemkald: %s mislykkedes: %s" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ukendt fejl %d under arbejdet med pakken %s" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " skaber konflikt med %s-%s-%s\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " krćves af %s-%s-%s\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "========== gemmer omrokeringer\n" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ekskluderer %s\n" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omrokerer %s -> %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ekskluderer multilib-sti %s%s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "ekskluderer %s %s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "omrokerer %s til %s\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "omrokerer kataloget %s til %s\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke oprette %s: %s\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kunne ikke skrive til %s\n" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binćr fundet\n" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "křrer postinstallations-skript (hvis det findes)\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "křrsel af smĺskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "křrsel af smĺskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pakke: %s-%s-%s filer test = %d\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr " for fil " -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke ĺbne %s: %s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" @@ -2396,7 +2401,7 @@ msgid "can't query %s: %s\n" msgstr "kunne ikke forespřrge %s: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "ĺbning af %s mislykkedes %s\n" @@ -2469,7 +2474,7 @@ msgstr "pakkens post-nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %d kunne ikke lćses\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" @@ -2563,7 +2568,7 @@ msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" @@ -2608,7 +2613,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:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "%s kunne ikke installeres\n" @@ -2626,26 +2631,26 @@ msgstr "afhćngighedskrav, der ikke kunne imřdekommes:\n" msgid "installing binary packages\n" msgstr "installerer binćrpakker\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "kunne ikke ĺbne fil %s: %s\n" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" angiver flere pakker\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "fjernelse af disse pakker ville bryde afhćngighederne:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "kunne ikke ĺbne %s: %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" @@ -2897,13 +2902,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -921,7 +921,7 @@ msgid "Could not open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nicht möglich %s zu schreiben" @@ -956,7 +956,7 @@ msgstr "Nicht möglich %s zu schreiben" msgid "Unable to write payload to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1769,7 +1769,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2337,193 +2337,198 @@ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)" msgid "generate signature" msgstr "PGP-Signatur generieren" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " steht im Konflikt mit %s-%s-%s\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " wird von %s-%s-%s gebraucht\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:244 +#: lib/problems.c:237 #, fuzzy, c-format -msgid "package %s is for a different architecture" +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/problems.c:249 +#: lib/problems.c:242 #, fuzzy, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:254 +#: lib/problems.c:247 #, fuzzy, c-format msgid "package %s is already installed" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:259 +#: lib/problems.c:252 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, 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/problems.c:274 +#: lib/problems.c:267 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:294 +#: lib/problems.c:287 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " steht im Konflikt mit %s-%s-%s\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " wird von %s-%s-%s gebraucht\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" # , c-format -#: lib/psm.c:274 +#: lib/psm.c:276 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Hole %s heraus\n" -#: lib/psm.c:277 +#: lib/psm.c:279 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "kann Datei %s nicht öffnen: " # , c-format -#: lib/psm.c:347 +#: lib/psm.c:349 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Hole %s heraus\n" # , c-format -#: lib/psm.c:413 +#: lib/psm.c:415 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Hole %s heraus\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "Keine Stufen ausführen" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "Ausführung des Skripts fehlgeschlagen" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "Ausführung des Skripts fehlgeschlagen" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" @@ -2574,7 +2579,7 @@ msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" @@ -2650,7 +2655,7 @@ msgstr "ungültige Paket-Nummer: %s\n" msgid "record %u could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -2745,7 +2750,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" @@ -2792,7 +2797,7 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" @@ -2811,27 +2816,27 @@ msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" msgid "installing binary packages\n" msgstr "Paket installieren" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" # oder besser: "... verletzen" ? -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" @@ -3095,13 +3100,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" diff --git a/po/en_RN.po b/po/en_RN.po index eef15a11f..670b330d7 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: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,181 +2105,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2401,7 +2406,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,7 +2496,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2536,7 +2541,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,26 +2559,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2820,13 +2825,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,181 +2105,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2401,7 +2406,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,7 +2496,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2536,7 +2541,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,26 +2559,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2820,13 +2825,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index eef15a11f..670b330d7 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: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,181 +2105,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2401,7 +2406,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,7 +2496,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2536,7 +2541,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,26 +2559,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2820,13 +2825,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -835,7 +835,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Could not open %s: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "%s:n kirjoitus ei onnistu" @@ -865,7 +865,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Unable to write payload to %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1646,7 +1646,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2203,184 +2203,189 @@ msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)" msgid "generate signature" msgstr "generoi PGP-allekirjoitus" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr "vaatii %s-%s-%s\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 +#: lib/problems.c:237 #, fuzzy, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:249 +#: lib/problems.c:242 #, fuzzy, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:254 +#: lib/problems.c:247 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:259 +#: lib/problems.c:252 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, 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/problems.c:274 +#: lib/problems.c:267 #, 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/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr "vaatii %s-%s-%s\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Haen: %s\n" -#: lib/psm.c:277 +#: lib/psm.c:279 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:347 +#: lib/psm.c:349 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Haen: %s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Haen: %s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "älä suorita mitään vaiheita" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" @@ -2431,7 +2436,7 @@ msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" @@ -2505,7 +2510,7 @@ msgstr "virheellinen paketin numero: %s\n" msgid "record %u could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -2599,7 +2604,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" @@ -2645,7 +2650,7 @@ msgstr "virhe luotaessa hakemistoa %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" @@ -2664,26 +2669,26 @@ msgstr "puuttuvat riippuvuudet:\n" msgid "installing binary packages\n" msgstr "asenna paketti" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" @@ -2944,13 +2949,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -870,7 +870,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Could not open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -900,7 +900,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1681,7 +1681,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2253,183 +2253,188 @@ msgstr "" msgid "generate signature" msgstr " --sign - genre une signature PGP" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, fuzzy, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:249 +#: lib/problems.c:242 #, fuzzy, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:254 +#: lib/problems.c:247 #, fuzzy, c-format msgid "package %s is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:259 +#: lib/problems.c:252 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, 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/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 #, fuzzy msgid "source package contains no .spec file\n" msgstr "" " -f <file>+ - interroge le package qui appartient <file>" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" @@ -2480,7 +2485,7 @@ msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" @@ -2554,7 +2559,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2646,7 +2651,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2692,7 +2697,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2710,26 +2715,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2987,13 +2992,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -811,7 +811,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -841,7 +841,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1593,7 +1593,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2100,181 +2100,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2323,7 +2328,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2396,7 +2401,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2486,7 +2491,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2531,7 +2536,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2549,26 +2554,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2815,13 +2820,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,181 +2105,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2401,7 +2406,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,7 +2496,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2536,7 +2541,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,26 +2559,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2820,13 +2825,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,181 +2105,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2401,7 +2406,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,7 +2496,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2536,7 +2541,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,26 +2559,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2820,13 +2825,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -815,7 +815,7 @@ msgstr "Get ekki lesiđ haus úr %s: %s\n" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "Get ekki ritađ í pakka: %s\n" @@ -845,7 +845,7 @@ msgstr "Get ekki lesiđ innihald %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Get ekki ritađ innihald í %s: %s\n" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "Skrifađi: %s\n" @@ -1599,7 +1599,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2111,181 +2111,186 @@ msgstr "" msgid "generate signature" msgstr "búa til undirskrift" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d fćra %s -> %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "gat ekki búiđ til %%%s %s\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "get ekki ritađ í %%%s %s\n" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnađ %s: %s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" @@ -2334,7 +2339,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2407,7 +2412,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2497,7 +2502,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2542,7 +2547,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2560,26 +2565,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2826,13 +2831,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,181 +2105,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2401,7 +2406,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,7 +2496,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2536,7 +2541,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,26 +2559,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2820,13 +2825,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -862,7 +862,7 @@ msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤¤Ţ¤ť¤ó: %s" msgid "Could not open %s: %s\n" msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s" @@ -892,7 +892,7 @@ msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤¤Ţ¤ť¤ó: %s" msgid "Unable to write payload to %s: %s\n" msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "˝ń¤šţ¤ßĂć: %s\n" @@ -1679,7 +1679,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabDate() RPM_STRING_TYPE ĽŤĽŚĽóĽČ¤Ď 1 ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤óĄŁ\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "ĽÇĄźĽżĽżĽ¤Ľ× %d ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n" @@ -2252,195 +2252,200 @@ msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë˝đĚž¤ˇ¤Ţ¤š(¸˝şß¤Î˝đĚž¤ĎźÎ¤Ć¤é¤ě¤Ţ¤š)" msgid "generate signature" msgstr "PGP/GPG ˝đĚž¤ňŔ¸ŔŽ¤ˇ¤Ţ¤š" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " %s-%s-%s ¤ČśĽšç¤ˇ¤Ţ¤š\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr "¤Ď %s-%s-%s ¤ËÉŹÍפȤľ¤ě¤Ć¤¤¤Ţ¤š\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 +#: lib/problems.c:237 #, fuzzy, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď°Ű¤Ę¤ëĽ˘ĄźĽĽĆĽŻĽÁĽă¸ţ¤ą¤Ç¤š" -#: lib/problems.c:249 +#: lib/problems.c:242 #, fuzzy, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď°Ű¤Ę¤ë OS ¸ţ¤ą¤Ç¤š" -#: lib/problems.c:254 +#: lib/problems.c:247 #, fuzzy, c-format msgid "package %s is already installed" msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤š" -#: lib/problems.c:259 +#: lib/problems.c:252 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎşĆÇŰĂ֤Ǥ¤Ţ¤ť¤ó" -#: lib/problems.c:264 +#: lib/problems.c:257 #, fuzzy, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" "ĽŐĽĄĽ¤Ľë %s ¤Ď %s-%s-%s ¤Č %s-%s-%s ¤ÎĽ¤ĽóĽšĽČĄźĽë¤ÎĽŐĽĄĽ¤Ľë¤ČśĽšç¤ˇ¤Ć¤¤¤Ţ¤š" -#: lib/problems.c:269 +#: lib/problems.c:262 #, 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/problems.c:274 +#: lib/problems.c:267 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s (%s-%s-%s¤č¤ę¤âżˇ¤ˇ¤¤¤â¤Î) ¤Ď¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ" "¤š" -#: lib/problems.c:279 +#: lib/problems.c:272 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ÎĽ¤ĽóĽšĽČĄźĽë¤Ď %ld%cb ¤ŹÉŹÍפǤš(%s ĽŐĽĄĽ¤ĽëĽˇĽšĽĆĽŕžĺ" "¤Ç)" -#: lib/problems.c:289 +#: lib/problems.c:282 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ÎĽ¤ĽóĽšĽČĄźĽë¤Ď %ld%cb ¤ŹÉŹÍפǤš(%s ĽŐĽĄĽ¤ĽëĽˇĽšĽĆĽŕžĺ" "¤Ç)" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÉÔĚŔ¤ĘĽ¨ĽéĄź %d ¤ŹĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ÎÁŕşîĂć¤Ë¤Ş¤¤Ţ¤ˇ¤ż" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " %s-%s-%s ¤ČśĽšç¤ˇ¤Ţ¤š\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr "¤Ď %s-%s-%s ¤ËÉŹÍפȤľ¤ě¤Ć¤¤¤Ţ¤š\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS ¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s" -#: lib/psm.c:277 +#: lib/psm.c:279 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "%s ¤ňşîŔŽ¤Ç¤¤Ţ¤ť¤ó: %s\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "%s ¤Ř˝ń¤šţ¤á¤Ţ¤ť¤ó" -#: lib/psm.c:1198 +#: lib/psm.c:1200 #, fuzzy msgid "source package expected, binary found\n" msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ź´üÂÔ¤ľ¤ě¤Ţ¤šĄ˘ĽĐĽ¤ĽĘĽę¤Ď¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż" -#: lib/psm.c:1322 +#: lib/psm.c:1324 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ď .spec ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "ĽÝĽšĽČĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "ĽŃĽĂĽąĄźĽ¸: %s-%s-%s ĽŐĽĄĽ¤ĽëĽĆĽšĽČ = %d\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "ĽćĄźĽś %s ¤Ď¸şß¤ˇ¤Ţ¤ť¤ó - root ¤ňťČÍѤˇ¤Ţ¤š" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Ľ°ĽëĄźĽ× %s ¤Ď¸şß¤ˇ¤Ţ¤ť¤ó - root ¤ňťČÍѤˇ¤Ţ¤š" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ĽŐĽĄĽ¤Ľë %s ¤ÎĽ˘ĄźĽŤĽ¤ĽÖ¤ÎżÄš¤ËźşÇÔ %s%s: %s" -#: lib/psm.c:2231 +#: lib/psm.c:2233 #, fuzzy msgid " on file " msgstr "ĽŐĽĄĽ¤Ľëžĺ" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s źşÇÔ" @@ -2490,7 +2495,7 @@ msgid "can't query %s: %s\n" msgstr "%s ¤ňşď˝ü(unlink)¤Ç¤¤Ţ¤ť¤ó: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n" @@ -2564,7 +2569,7 @@ msgstr "ĽŃĽĂĽąĄźĽ¸ĽěĽłĄźĽÉČÖšć %d\n" msgid "record %u could not be read\n" msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n" @@ -2660,7 +2665,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n" @@ -2706,7 +2711,7 @@ msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ť¤é¤ÎĆɤߚţ¤ßĽ¨ĽéĄź " msgid "file %s requires a newer version of RPM\n" msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ë¤Ď¤č¤ężˇ¤ˇ¤¤ RPM ¤ÎĽĐĄźĽ¸ĽçĽó¤ŹÉŹÍפǤš\n" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽë¤Ç¤¤Ţ¤ť¤ó\n" @@ -2724,26 +2729,26 @@ msgstr "°Í¸Ŕ¤ÎˇçÇĄ:\n" msgid "installing binary packages\n" msgstr "ĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "ĽŐĽĄĽ¤Ľë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤¤Ţ¤ť¤ó: %s" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ĎĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤡ¤Ć¤¤¤Ţ¤š\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "¤ł¤ě¤é¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤š¤ë¤Č°Í¸Ŕ¤ňÇ˲ő¤ˇ¤Ţ¤š:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤¤Ţ¤ť¤ó\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n" @@ -3004,13 +3009,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "˝đĚžĽŃĽĂĽÉ: %d\n" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ď missingok ĽŐĽéĽ°¤Î¤ż¤áĽšĽĽĂĽ×¤ˇ¤Ţ¤š\n" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "ĽÇĽŁĽěĽŻĽČĽę¤Î˝üł°: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n" "Language-Team: GNU Translation project <ko@li.org>\n" @@ -822,7 +822,7 @@ msgstr "ź¸í(signature) Çě´ő¸Ś ´Ů˝Ă ŔĐžîżĂ źö žř˝Ŕ´Ď´Ů.\n" msgid "Could not open %s: %s\n" msgstr "%s (Ŕť)¸Ś ż źö žřŔ˝: %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "ĆĐĹ°Áö¸Ś ŔŰźşÇŇ źö žřŔ˝: %s\n" @@ -852,7 +852,7 @@ msgstr "%s ŔÇ payload¸Ś ŔĐŔť źö žřŔ˝: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "%s żĄ payload¸Ś ŔŰźşÇŇ źö žřŔ˝: %s\n" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "ŔŰźş: %s\n" @@ -1620,7 +1620,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE ÄŤżîĆŽ´Â šÝľĺ˝Ă '1' ŔĚžîžß ÇŐ´Ď´Ů.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "%d ľĽŔĚĹÍ ŔŻÇüŔş ťçżëÇĎ˝Ç źö žř˝Ŕ´Ď´Ů\n" @@ -2144,195 +2144,200 @@ msgstr "ĆĐĹ°ÁöżĄ ź¸íÇŐ´Ď´Ů (ąâÁ¸ŔÇ ź¸íŔş ťčÁŚľË´Ď´Ů)" msgid "generate signature" msgstr "ź¸íŔť ŔŰźşÇŐ´Ď´Ů" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " %s-%s-%s (żÍ)°ú ĂćľšÇŐ´Ď´Ů\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " (Ŕş)´Â %s-%s-%s żĄź ÇĘżäˇÎ ÇŐ´Ď´Ů\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 -#, c-format -msgid "package %s is for a different architecture" +#: lib/problems.c:237 +#, fuzzy, c-format +msgid "package %s is intended for a %s architecture" msgstr "%s (Ŕş)´Â ´Ů¸Ľ žĆĹ°ĹŘĂĸŚ Ŕ§ÇŃ ĆĐĹ°ÁöŔÔ´Ď´Ů" -#: lib/problems.c:249 -#, c-format -msgid "package %s is for a different operating system" +#: lib/problems.c:242 +#, fuzzy, c-format +msgid "package %s is intended for a %s operating system" msgstr "%s (Ŕş)´Â ´Ů¸Ľ żîżľĂźÁŚ¸Ś Ŕ§ÇŃ ĆĐĹ°ÁöŔÔ´Ď´Ů" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "%s ĆĐĹ°Áö´Â ŔĚšĚ źłÄĄľÇžî ŔÖ˝Ŕ´Ď´Ů" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%2$s ĆĐĹ°Áö žČŔÇ %1$s °ćˇÎ´Â ŔçščÄĄÇŇ źö žř˝Ŕ´Ď´Ů" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%2$s (żÍ)°ú %3$s ŔÇ źłÄĄ °úÁ¤żĄź %1$s ĆÄŔĎŔĚ źˇÎ ĂćľšÇŐ´Ď´Ů" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "%2$s żĄź źłÄĄľÇ´Â %1$s ĆÄŔĎŔş %3$s ĆĐĹ°ÁöŔÇ ĆÄŔĎ°ú ĂćľšÇŐ´Ď´Ů" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s ĆĐĹ°Áö (%s ş¸´Ů ĂÖ˝ĹŔÇ ĆĐĹ°Áö)´Â ŔĚšĚ źłÄĄľÇžî ŔÖ˝Ŕ´Ď´Ů" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" "%4$s ĆÄŔϽýşĹŰ ťóżĄź %1$s ĆĐĹ°Áö¸Ś źłÄĄÇŇ °ćżěżĄ´Â %2$ld%3$cb (ŔĚ)°Ą ÇĘżäÇŐ" "´Ď´Ů" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "%3$s ĆÄŔϽýşĹŰ ťóżĄź %1$s ĆĐĹ°Áö¸Ś źłÄĄÇŇ °ćżěżĄ´Â %2$ld ŔÇ žĆŔĚłëľĺ(inode)" "°Ą ÇĘżäÇŐ´Ď´Ů" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" "%s ĆĐĹ°ÁöŔÇ źą(pre)-ĆŽˇŁŔčźÇ ˝Ă˝şĹŰÄÝ(syscall): %s (ŔĚ)°Ą ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "%s-%s-%s ĆĐĹ°ÁöŔÇ ÇĘżä ťçÇ×ŔĚ ¸¸ÁˇľÇÁö žĘŔ˝: %s\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "%s-%s-%s ĆĐĹ°ÁöŔÇ ÇĘżä ťçÇ×ŔĚ ¸¸ÁˇľÇÁö žĘŔ˝: %s\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" "%2$s ĆĐĹ°Áö¸Ś Ăł¸ŽÇĎ´Â °úÁ¤żĄź žË źö žř´Â żŔˇů %1$d (ŔĚ)°Ą šßťýÇß˝Ŕ´Ď´Ů" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " %s-%s-%s (żÍ)°ú ĂćľšÇŐ´Ď´Ů\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " (Ŕş)´Â %s-%s-%s żĄź ÇĘżäˇÎ ÇŐ´Ď´Ů\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "========== ŔçščÄĄ\n" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ÁŚżÜ(exclude) %s\n" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d ŔçščÄĄ %s -> %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "%s%s multilib °ćˇÎ¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "%s %s (Ŕť)¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "%s żĄź %s (Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s ľđˇşĹ与¸Ś %s (Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s %s (Ŕť)¸Ś ťýźşÇŇ źö žř˝Ŕ´Ď´Ů\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s %s (Ŕť)¸Ś ŔŰźşÇŇ źö žř˝Ŕ´Ď´Ů\n" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "źŇ˝ş ĆĐĹ°Áö°Ą żäą¸ľË´Ď´Ů, šŮŔ̳ʸŽ¸Ś ĂŁžŇ˝Ŕ´Ď´Ů\n" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "źŇ˝ş ĆĐĹ°ÁöżĄ .spec ĆÄŔĎŔĚ Ć÷ÇԾǞî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s ˝şĹŠ¸łĆŽ¸Ś ˝ÇÇŕÇŐ´Ď´Ů (ŔÖŔť °ćżě)\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "%2$s-%3$s-%4$s ŔÇ %1$s ˝şĹŠ¸łĆŽ¸´(scriptlet) ˝ÇÇ࿥ ˝ÇĆĐÇß˝Ŕ´Ď´Ů, waitpid°Ą %" "5$s (Ŕť)¸Ś šÝČŻÇĎż´˝Ŕ´Ď´Ů \n" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "%2$s-%3$s-%4$s ŔÇ %1$s ˝şĹŠ¸łĆŽ¸´(scriptlet) ˝ÇÇ࿥ ˝ÇĆĐÇß˝Ŕ´Ď´Ů, Ážˇá ťóȲ %" "5$d\n" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s (ŔĚ)°Ą %d ŔÇ ĆÄŔĎŔť °Ž°í ŔÖ˝Ŕ´Ď´Ů, Ĺ×˝şĆŽ = %d\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" "%s: %s ˝şĹŠ¸łĆŽ¸´(scriptlet)°Ą ˝ÇĆĐÇß˝Ŕ´Ď´Ů (%d), %s-%s-%s (Ŕť)¸Ś ťýˇŤÇŐ´Ď" "´Ů\n" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s ťçżëŔÚ°Ą Á¸ŔçÇĎÁö žĘ˝Ŕ´Ď´Ů - root¸Ś ŔĚżëÇŐ´Ď´Ů\n" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ą×ˇěŔĚ Á¸ŔçÇĎÁö žĘ˝Ŕ´Ď´Ů - root¸Ś ŔĚżëÇŐ´Ď´Ů\n" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "žĆÄŤŔ̺긌 ÇŞ´ÂľĽ ˝ÇĆĐÇÔ%s%s: %s\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr " ´ŮŔ˝ ĆÄŔĎżĄ " -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ĆÄŔĎŔÇ %1$s (ŔĚ)°Ą ˝ÇĆĐÇÔ: %3$s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "%s (ŔĚ)°Ą ˝ÇĆĐÇÔ: %s\n" @@ -2381,7 +2386,7 @@ msgid "can't query %s: %s\n" msgstr "%s (Ŕť)¸Ś ÁúŔÇÇŇ źö žřŔ˝: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "%s (Ŕť)¸Ś żŠ´ÂľĽ ˝ÇĆĐÇÔ: %s\n" @@ -2454,7 +2459,7 @@ msgstr "ĆĐĹ°Áö ąâˇĎ(record) šřČŁ: %u\n" msgid "record %u could not be read\n" msgstr "ąâˇĎ(record) šřČŁ %u (Ŕş)´Â ŔĐŔť źö žř˝Ŕ´Ď´Ů\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "%s ĆĐĹ°Áö´Â źłÄĄľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n" @@ -2548,7 +2553,7 @@ msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "%s-%s-%s ĆĐĹ°ÁöŔÇ ÇĘżä ťçÇ×ŔĚ ¸¸ÁˇľÇÁö žĘŔ˝: %s\n" @@ -2593,7 +2598,7 @@ msgstr "%s ĆÄŔĎŔť ŔĐ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n" msgid "file %s requires a newer version of RPM\n" msgstr "%s ĆÄŔĎŔĚ ĂֽŠšöŔüŔÇ RPMŔť ÇĘżäˇÎ ÇŐ´Ď´Ů\n" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "%s (Ŕş)´Â źłÄĄľÉ źö žř˝Ŕ´Ď´Ů\n" @@ -2611,26 +2616,26 @@ msgstr "ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇŘ ˝ÇĆĐÇÔ:\n" msgid "installing binary packages\n" msgstr "šŮŔ̳ʸŽ ĆĐĹ°Áö¸Ś źłÄĄÇŐ´Ď´Ů\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s ĆÄŔĎŔť ż źö žřŔ˝: %s\n" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" żŠˇŻ°łŔÇ ĆĐĹ°Áö¸Ś ÁöÁ¤ÇŐ´Ď´Ů\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "ŔĚ ĆĐĹ°ÁöľéŔť ÁŚ°ĹÇϸé ŔÇÁ¸źşŔĚ ąúÁú źö ŔÖŔ˝:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "%s (Ŕť)¸Ś ż źö žřŔ˝: %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "%s (Ŕť)¸Ś źłÄĄÇŐ´Ď´Ů\n" @@ -2880,13 +2885,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "ź¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç᥹סΠŔÎÇŘ %s (Ŕť)¸Ś ťýˇŤÇŐ´Ď´Ů\n" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "%s ľđˇşĹ与¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -825,7 +825,7 @@ msgstr "Kunne ikke ĺpne spec fil %s: %s\n" msgid "Could not open %s: %s\n" msgstr "Kunne ikke ĺpne %s: %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -855,7 +855,7 @@ msgstr "Kunne ikke lese \"payload\" fra %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive \"payload\" til %s: %s\n" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1613,7 +1613,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d ikke střttet\n" @@ -2133,183 +2133,188 @@ msgstr "signer en pakke (forkast nĺvćrende signatur)" msgid "generate signature" msgstr "generer signatur" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " er i konflikt med %s-%s-%s\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " kreves av %s-%s-%s\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 -#, c-format -msgid "package %s is for a different architecture" +#: lib/problems.c:237 +#, fuzzy, c-format +msgid "package %s is intended for a %s architecture" msgstr "pakke %s er for en annen arkitektur" -#: lib/problems.c:249 -#, c-format -msgid "package %s is for a different operating system" +#: lib/problems.c:242 +#, fuzzy, c-format +msgid "package %s is intended for a %s operating system" msgstr "pakke %s er for et annet operativsystem" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "pakke %s er allerede installert" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke relokeres" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " er i konflikt med %s-%s-%s\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " kreves av %s-%s-%s\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omplasser %s -> %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ekskluderer multilib-sti %s%s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "eksluderer %s %s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "relokerer %s til %s\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "relokerer katalog %s til %s\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke opprette %%%s %s\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan ikke skrive til %%%s %s\n" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binćr funnet\n" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kjřrer %s-skript (hvis noen)\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke ĺ ĺpne %s: %s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" @@ -2358,7 +2363,7 @@ msgid "can't query %s: %s\n" msgstr "kan ikke spřrre pĺ %s: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under ĺpning av %s: %s\n" @@ -2431,7 +2436,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" @@ -2521,7 +2526,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" @@ -2566,7 +2571,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:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2584,26 +2589,26 @@ msgstr "feilede avhengigheter:\n" msgid "installing binary packages\n" msgstr "installerer binćrpakker\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "fjerning av disse pakkene vil řdelegge avhengigheter:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke ĺpne %s: %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" @@ -2852,13 +2857,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Paweł Dziekoński <pdziekonski@mml.ch.pwr.wroc.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -852,7 +852,7 @@ msgstr "Nie można odczytać ikony: %s" msgid "Could not open %s: %s\n" msgstr "Nie można otworzyć %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie można zapisać pakietu: %s" @@ -882,7 +882,7 @@ msgstr "Nie można odczytać ikony: %s" msgid "Unable to write payload to %s: %s\n" msgstr "Nie można zapisać pakietu: %s" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1662,7 +1662,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE licznik musi być 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obsługiwany\n" @@ -2217,187 +2217,192 @@ msgstr "podpisz pakiet (porzuć bierzącą sygnaturę)" msgid "generate signature" msgstr "generuj sygnaturę PGP/GPG" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " jest w konflikcie z %s-%s-%s\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " jest wymagany przez %s-%s-%s\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 +#: lib/problems.c:237 #, fuzzy, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "pakiet %s-%s-%s zbudowano dla innej architektury" -#: lib/problems.c:249 +#: lib/problems.c:242 #, fuzzy, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego" -#: lib/problems.c:254 +#: lib/problems.c:247 #, fuzzy, c-format msgid "package %s is already installed" msgstr "pakiet %s-%s-%s jest już zainstalowany" -#: lib/problems.c:259 +#: lib/problems.c:252 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, 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/problems.c:274 +#: lib/problems.c:267 #, 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/problems.c:279 +#: lib/problems.c:272 #, 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/problems.c:289 +#: lib/problems.c:282 #, 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/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "zależności pakietu %s nie zostały spełnione: %s\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "zależności pakietu %s nie zostały spełnione: %s\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, 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/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " jest w konflikcie z %s-%s-%s\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " jest wymagany przez %s-%s-%s\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Ten OS nie jest wspierany: %s" -#: lib/psm.c:277 +#: lib/psm.c:279 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "wyłączanie %s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "wyłączanie %s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie można utworzyć %s" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie można zapisać do %s" -#: lib/psm.c:1198 +#: lib/psm.c:1200 #, fuzzy msgid "source package expected, binary found\n" msgstr "spodziewany pakiet źródłowy a nie binarny" -#: lib/psm.c:1322 +#: lib/psm.c:1324 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pakiet źródłowy nie zawiera pliku .spec" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "uruchamianie skryptu postinstall (jeśli istnieje)\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "wykonanie skryptu nie powiodło się" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "wykonanie skryptu nie powiodło się" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pakiet: %s-%s-%s test plików = %d\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "użytkownik %s nie istnieje - użyto konta root" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - użyto grupy root" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozpakowanie archiwum nie powiodło się %s%s: %s" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr " na pliku " -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie można otworzyć %s: %s" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiodło się" @@ -2447,7 +2452,7 @@ msgid "can't query %s: %s\n" msgstr "nie można odwiązać %s: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiodło się\n" @@ -2521,7 +2526,7 @@ msgstr "numer rekordu pakietu: %d\n" msgid "record %u could not be read\n" msgstr "nie można odczytać rekordu %d\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -2614,7 +2619,7 @@ msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "zależności pakietu %s nie zostały spełnione: %s\n" @@ -2660,7 +2665,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:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie może być zainstalowany\n" @@ -2678,26 +2683,26 @@ msgstr "niespełnione zależności:\n" msgid "installing binary packages\n" msgstr "instalacja pakietów binarnych\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie można otworzyć pliku %s: %s" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" określa wiele pakietów\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "usunięcie tych pakietów zerwie zależności:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie można otworzyć %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" @@ -2957,13 +2962,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominięty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 2000-06-22 01:13+01:00\n" "Last-Translator: José Nuno Coelho Sanarra Pires\n" "Language-Team: pt <kde@poli.org>\n" @@ -823,7 +823,7 @@ msgstr "Năo consegui ler o cabeçalho de %s: %s\n" msgid "Could not open %s: %s\n" msgstr "Năo consigo aceder ao %s: %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "Năo consegui gravar o pacote: %s\n" @@ -853,7 +853,7 @@ msgstr "Năo consegui ler o conteúdo de %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Năo consegui escrever o conteúdo de %s: %s\n" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" @@ -1616,7 +1616,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "o valor RPM_STRING_TYPE do dataLength() tem de ser 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "O tipo de dados %d năo é suportado\n" @@ -2147,183 +2147,188 @@ msgstr "assinar um pacote (retira a assinatura actual)" msgid "generate signature" msgstr "gerar a assinatura PGP/GPG" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " está em conflito com o %s-%s-%s\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " é necessário pelo %s-%s-%s\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 -#, c-format -msgid "package %s is for a different architecture" +#: lib/problems.c:237 +#, fuzzy, c-format +msgid "package %s is intended for a %s architecture" msgstr "o pacote %s é para uma arquitectura diferente" -#: lib/problems.c:249 -#, c-format -msgid "package %s is for a different operating system" +#: lib/problems.c:242 +#, fuzzy, c-format +msgid "package %s is intended for a %s operating system" msgstr "o pacote %s é para um sistema operativo diferente" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "o pacote %s já está instalado" -#: lib/problems.c:259 +#: lib/problems.c:252 #, 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/problems.c:264 +#: lib/problems.c:257 #, 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/problems.c:269 +#: lib/problems.c:262 #, 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/problems.c:274 +#: lib/problems.c:267 #, 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/problems.c:279 +#: lib/problems.c:272 #, 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/problems.c:289 +#: lib/problems.c:282 #, 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/problems.c:294 +#: lib/problems.c:287 #, 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/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "requisito %s-%s-%s do pacote năo satisfeito: %s\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "requisito %s-%s-%s do pacote năo satisfeito: %s\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " está em conflito com o %s-%s-%s\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " é necessário pelo %s-%s-%s\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "========== mudanças de local\n" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "%5d excluir o %s\n" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d mudar de local %s -> %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "a exclur a directoria 'multilib' %s%s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "a excluir o %s %s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "a mudar o %s para %s\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "a mudar a directoria %s para %s\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "năo consigo criar o %s: %s\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "năo consigo escrever em %s\n" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "o pacote de código-fonte năo contem um ficheiro .spec\n" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "a correr os programas de pós-instalaçăo (se existirem)\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "a execuçăo do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "a execuçăo do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pacote: teste dos ficheiros do %s-%s-%s = %d\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "o utilizador %s năo existe - a usar o root\n" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "o grupo %s năo existe - a usar o root\n" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "falhei ao aceder ao %s: %s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "O %s falhou\n" @@ -2372,7 +2377,7 @@ msgid "can't query %s: %s\n" msgstr "năo consigo pesquisar o %s: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "o acesso ao %s falhou: %s\n" @@ -2445,7 +2450,7 @@ msgstr "número de registo do pacote: %u\n" msgid "record %u could not be read\n" msgstr "o registo %d năo pôde ser lido\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "o pacote %s năo está instalado\n" @@ -2539,7 +2544,7 @@ msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "requisito %s-%s-%s do pacote năo satisfeito: %s\n" @@ -2584,7 +2589,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:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "o %s năo pode ser instalado\n" @@ -2602,26 +2607,26 @@ msgstr "dependęncias falhadas:\n" msgid "installing binary packages\n" msgstr "a instalar os pacotes binários\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "năo consigo aceder ao ficheiro %s: %s\n" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "o \"%s\" especifica vários pacotes\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "a remoçăo destes pacotes irá quebrar dependęncias:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "năo consigo aceder ao %s: %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "A instalar o %s\n" @@ -2871,13 +2876,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "'Pad' ou preenchimento da assinatura: %d\n" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido ŕ opçăo missingok\n" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0f6e665de..18e3f864b 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: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" #: build.c:36 #, fuzzy @@ -911,7 +911,7 @@ msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" @@ -946,7 +946,7 @@ msgstr "No consegui abrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1777,7 +1777,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2342,80 +2342,85 @@ msgstr "assine um pacote (descarte a assinatura corrente)" msgid "generate signature" msgstr "gere assinatura PGP" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, fuzzy, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:249 +#: lib/problems.c:242 #, fuzzy, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:254 +#: lib/problems.c:247 #, fuzzy, c-format msgid "package %s is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:259 +#: lib/problems.c:252 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" @@ -2427,13 +2432,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:274 +#: lib/psm.c:276 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "RPM verso %s\n" # , c-format -#: lib/psm.c:277 +#: lib/psm.c:279 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "No consegui abrir: %s\n" @@ -2446,7 +2451,7 @@ msgstr "No consegui abrir: %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:347 +#: lib/psm.c:349 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "RPM verso %s\n" @@ -2459,94 +2464,94 @@ msgstr "RPM verso %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:413 +#: lib/psm.c:415 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "RPM verso %s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" # , c-format -#: lib/psm.c:502 +#: lib/psm.c:504 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual <arquivo> pertence" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "no execute nenhum estgio" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" @@ -2598,7 +2603,7 @@ msgid "can't query %s: %s\n" msgstr "No consegui abrir: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construo falhou.\n" @@ -2673,7 +2678,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" @@ -2769,7 +2774,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "no foi passado pacote para instalao" @@ -2823,7 +2828,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "no foi passado pacote para instalao" @@ -2844,28 +2849,28 @@ msgid "installing binary packages\n" msgstr "instale pacote" # , c-format -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 #, fuzzy msgid "removing these packages would break dependencies:\n" msgstr "lista dependncias do pacote" # , c-format -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -3134,7 +3139,7 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3148,7 +3153,7 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -811,7 +811,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -841,7 +841,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1593,7 +1593,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2100,181 +2100,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2323,7 +2328,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2396,7 +2401,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2486,7 +2491,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2531,7 +2536,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2549,26 +2554,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2815,13 +2820,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 03a7a2f02..b91e0db15 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,181 +2105,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2401,7 +2406,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,7 +2496,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2536,7 +2541,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,26 +2559,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2820,13 +2825,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -834,7 +834,7 @@ msgstr "îĹ×ĎÚÍĎÖÎĎ ĐĹŇĹÚÁÇŇŐÚÉÔŘ ÚÁÇĎĚĎ×ĎË ĐĎÄĐÉÓÉ.\n" msgid "Could not open %s: %s\n" msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ĐÁËĹÔ: %s\n" @@ -864,7 +864,7 @@ msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ÓĎÄĹŇÖÉÍĎĹ ÉÚ %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ÓĎÄĹŇÖÉÍĎĹ × %s: %s\n" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "úÁĐÉÓÁÎ: %s\n" @@ -1639,7 +1639,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() ÄĎĐŐÓÔÉÍ ÔĎĚŘËĎ ĎÄÉÎ ÜĚĹÍĹÎÔ ÔÉĐÁ RPM_STRING_TYPE\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉĐ ÄÁÎÎŮČ %d ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ\n" @@ -2163,183 +2163,188 @@ msgstr "ĐĎÄĐÉÓÁÔŘ ĐÁËĹÔ (ŐÄÁĚÉ× ÔĹËŐÝŐŔ ĐĎÄĐÉÓŘ)" msgid "generate signature" msgstr "ÇĹÎĹŇÉŇĎ×ÁÔŘ ĐĎÄĐÉÓŘ" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " ËĎÎĆĚÉËÔŐĹÔ Ó %s-%s-%s\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " ÎŐÖĹÎ ÄĚŃ %s-%s-%s\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 -#, c-format -msgid "package %s is for a different architecture" +#: lib/problems.c:237 +#, fuzzy, c-format +msgid "package %s is intended for a %s architecture" msgstr "ĐÁËĹÔ %s - ÄĚŃ ÄŇŐÇĎĘ ÁŇČÉÔĹËÔŐŇŮ" -#: lib/problems.c:249 -#, c-format -msgid "package %s is for a different operating system" +#: lib/problems.c:242 +#, fuzzy, c-format +msgid "package %s is intended for a %s operating system" msgstr "ĐÁËĹÔ %s - ÄĚŃ ÄŇŐÇĎĘ ĎĐĹŇÁĂÉĎÎÎĎĘ ÓÉÓÔĹÍŮ" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "ĐÁËĹÔ %s ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "ĐŐÔŘ %s × ĐÁËĹÔĹ %s - ÎĹ ĐĹŇĹÍĹÝÁĹÍŮĘ" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "ËĎÎĆĚÉËÔ ĆÁĘĚÁ %s ĐŇÉ ĐĎĐŮÔËÁČ ŐÓÔÁÎĎ×ËÉ %s É %s" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "ĆÁĘĚ %s ÉÚ ŐÓÔÁÎĎ×ĚĹÎÎĎÇĎ ĐÁËĹÔÁ %s ËĎÎĆĚÉËÔŐĹÔ Ó ĆÁĘĚĎÍ ÉÚ ĐÁËĹÔÁ %s" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "ĐÁËĹÔ %s (ËĎÔĎŇŮĘ ÎĎ×ĹĹ, ŢĹÍ %s) ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "ÄĚŃ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ %s ÎŐÖÎĎ %ld%cb ÎÁ ĆÁĘĚĎ×ĎĘ ÓÉÓÔĹÍĹ %s" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "ÄĚŃ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ %s ÎŐÖÎĎ %ld inodes ÎÁ ĆÁĘĚĎ×ĎĘ ÓÉÓÔĹÍĹ %s" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "ĐÁËĹÔ %s pre-transaction syscall(s): %s: ĎŰÉÂËÁ: %s" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "ÔŇĹÂĎ×ÁÎÉŃ ĐÁËĹÔÁ %s-%s-%s ÎĹ ŐÄĎ×ĚĹÔ×ĎŇĹÎŮ: %s\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "ÔŇĹÂĎ×ÁÎÉŃ ĐÁËĹÔÁ %s-%s-%s ÎĹ ŐÄĎ×ĚĹÔ×ĎŇĹÎŮ: %s\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÎĹÉÚ×ĹÓÔÎÁŃ ĎŰÉÂËÁ %d ĐŇÉ ŇÁÂĎÔĹ Ó ĐÁËĹÔĎÍ %s" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " ËĎÎĆĚÉËÔŐĹÔ Ó %s-%s-%s\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " ÎŐÖĹÎ ÄĚŃ %s-%s-%s\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "========== ĐĹŇĹÍĹÝĹÎÉĘ\n" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ÉÓËĚŔŢĹÎ %s\n" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d ĐĹŇĹÍĹÝĹÎÉĹ %s -> %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ÉÓËĚŔŢÁĹÔÓŃ ÍÎĎÇĎÂÉÂĚÉĎÔĹŢÎŮĘ ĐŐÔŘ %s%s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "ÉÓËĚŔŢÁĹÔÓŃ %s %s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ ËÁÔÁĚĎÇ %s × %s\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %%%s %s\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐÉÓÁÔŘ × %%%s %s\n" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "ĎÂÎÁŇŐÖĹÎ Ä×ĎÉŢÎŮĘ ĐÁËĹÔ ×ÍĹÓÔĎ ĎÖÉÄÁĹÍĎÇĎ ÉÓČĎÄÎĎÇĎ\n" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "ÉÓČĎÄÎŮĘ ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ\n" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: ×ŮĐĎĚÎŃĹÔÓŃ ÓĂĹÎÁŇÉĘ %s (ĹÓĚÉ ĹÓÔŘ)\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "ĎŰÉÂËÁ ×ŮĐĎĚÎĹÎÉŃ ÓĂĹÎÁŇÉŃ %s ÉÚ %s-%s-%s, waitpid() ×ĎÚ×ŇÁÔÉĚ %s\n" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "ĎŰÉÂËÁ ×ŮĐĎĚÎĹÎÉŃ ÓĂĹÎÁŇÉŃ %s ÉÚ %s-%s-%s, ËĎÄ ×ĎÚ×ŇÁÔÁ %d\n" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s ÓĎÄĹŇÖÉÔ %d ĆÁĘĚĎ×, test = %d\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: ĎŰÉÂËÁ ÓĂĹÎÁŇÉŃ %s (%d), %s-%s-%s ĐŇĎĐŐÓËÁĹÔÓŃ\n" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "ĐĎĚŘÚĎ×ÁÔĹĚŘ %s ÎĹ ÓŐÝĹÓÔ×ŐĹÔ - ÉÓĐĎĚŘÚŐĹÔÓŃ root\n" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇŇŐĐĐÁ %s ÎĹ ÓŐÝĹÓÔ×ŐĹÔ - ÉÓĐĎĚŘÚŐĹÔÓŃ root\n" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ŇÁÓĐÁËĎ×ËÁ ÁŇČÉ×Á ÎĹ ŐÄÁĚÁÓŘ%s%s: %s\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr " ÎÁ ĆÁĘĚĹ " -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ĎŰÉÂËÁ ÎÁ ĆÁĘĚĹ %s: %s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎĹ ŐÄÁĚĎÓŘ: %s\n" @@ -2388,7 +2393,7 @@ msgid "can't query %s: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÚÁĐŇĎÓÉÔŘ %s: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n" @@ -2461,7 +2466,7 @@ msgstr "ÎĎÍĹŇ ÚÁĐÉÓÉ ĐÁËĹÔÁ: %u\n" msgid "record %u could not be read\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ÚÁĐÉÓŘ %u\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n" @@ -2555,7 +2560,7 @@ msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "ÔŇĹÂĎ×ÁÎÉŃ ĐÁËĹÔÁ %s-%s-%s ÎĹ ŐÄĎ×ĚĹÔ×ĎŇĹÎŮ: %s\n" @@ -2600,7 +2605,7 @@ msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÉÚ ĆÁĘĚÁ %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "ÄĚŃ ĆÁĘĚÁ %s ÎĹĎÂČĎÄÉÍÁ ÂĎĚĹĹ ÎĎ×ÁŃ ×ĹŇÓÉŃ RPM\n" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎĹ ÍĎÖĹÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎ\n" @@ -2618,26 +2623,26 @@ msgstr "ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ:\n" msgid "installing binary packages\n" msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁŔ ÂÉÎÁŇÎŮĹ ĐÁËĹÔŮ\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ %s: %s\n" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁĹÔ ÎĹÓËĎĚŘËĎ ĐÁËĹÔĎ×\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "ŐÄÁĚĹÎÉĹ ÜÔÉČ ĐÁËĹÔĎ× ÎÁŇŐŰÉÔ ÚÁ×ÉÓÉÍĎÓÔÉ:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "őÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ %s\n" @@ -2888,13 +2893,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "đĎÄĐÉÓŘ: ŇÁÚÍĹŇ(%d)+ÚÁĐĎĚÎĹÎÉĹ(%d)\n" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ĐŇĎĐŐÝĹÎ ÉÚ-ÚÁ ĆĚÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËĚŔŢÁĹÔÓŃ ËÁÔÁĚĎÇ %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -850,7 +850,7 @@ msgstr "Nie je možné prečítať ikonu: %s" msgid "Could not open %s: %s\n" msgstr "Otvorenie %s zlyhalo\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie je možné zapísať balík: %s" @@ -880,7 +880,7 @@ msgstr "Nie je možné prečítať ikonu: %s" msgid "Unable to write payload to %s: %s\n" msgstr "Nie je možné zapísať balík: %s" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -1661,7 +1661,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE počet musí byť 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovaný\n" @@ -2216,185 +2216,190 @@ msgstr "podpísať balík (zničiť aktuálny podpis)" msgid "generate signature" msgstr "vytvoriť PGP/GPG podpis" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " koliduje s %s-%s-%s\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " je vyžadované %s-%s-%s\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 +#: lib/problems.c:237 #, fuzzy, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "balík %s nie je nainštalovaný\n" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, fuzzy, c-format msgid "package %s is already installed" msgstr "balík %s nie je nainštalovaný\n" -#: lib/problems.c:259 +#: lib/problems.c:252 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "balík %s nie je nainštalovaný\n" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "balík %s nie je nainštalovaný\n" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "požiadavka balíka %s nie je uspokojená: %s\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "požiadavka balíka %s nie je uspokojená: %s\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " koliduje s %s-%s-%s\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " je vyžadované %s-%s-%s\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je vynechaný: %s" -#: lib/psm.c:277 +#: lib/psm.c:279 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "vynecháva sa %s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "vynecháva sa %s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie je možné zapísať do %s: " -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie je možné zapísať do %s: " -#: lib/psm.c:1198 +#: lib/psm.c:1200 #, fuzzy msgid "source package expected, binary found\n" msgstr "očakávaný zdrojový balík, nájdený binárny" -#: lib/psm.c:1322 +#: lib/psm.c:1324 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojový balík neobsahuje žiadny .spec súbor" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "vykonávajú sa poinštalačné skripty (ak existujú)\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "balík: %s-%s-%s test súborov = %d\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "používateľ %s neexistuje - použije sa root" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - použije sa root" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvoriť %s: %s" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" @@ -2444,7 +2449,7 @@ msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" @@ -2518,7 +2523,7 @@ msgstr "požaduje sa záznam číslo %d\n" msgid "record %u could not be read\n" msgstr "záznam %d nie je možné prečítať\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nainštalovaný\n" @@ -2611,7 +2616,7 @@ msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "požiadavka balíka %s nie je uspokojená: %s\n" @@ -2657,7 +2662,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:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je možné nainštalovať\n" @@ -2675,26 +2680,26 @@ msgstr "nevyriešené závislosti:\n" msgid "installing binary packages\n" msgstr "inštalujú sa binárne balíky\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie je možné otvoriť súbor %s: %s" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" špecifikuje viac balíkov\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "odstránenie týchto balíkov by porušilo závislosti:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je možné otvoriť %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "Inštaluje sa %s\n" @@ -2954,13 +2959,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\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.194 2001/11/08 22:05:18 jbj Exp $ +# $Id: sl.po,v 1.195 2001/11/09 17:22:36 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -848,7 +848,7 @@ msgstr "Ikone %s ni možno prebrati: %s" msgid "Could not open %s: %s\n" msgstr "Ni možno odpreti %s: %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ni možno zapisati paketa: %s" @@ -878,7 +878,7 @@ msgstr "Ikone %s ni možno prebrati: %s" msgid "Unable to write payload to %s: %s\n" msgstr "Ni možno zapisati paketa %s: %s" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1662,7 +1662,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "števec grabData() RPM_STRING_TYPE mora biti 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" @@ -2214,186 +2214,191 @@ msgstr "podpiši paket(e) (trenutni podpis zavrzi)" msgid "generate signature" msgstr "izdelava podpisa PGP/GPG" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " je v sporu z %s-%s-%s\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " potrebuje %s-%s-%s\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 +#: lib/problems.c:237 #, fuzzy, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "paket %s-%s-%s je za drug tip arhitekture" -#: lib/problems.c:249 +#: lib/problems.c:242 #, fuzzy, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "paket %s-%s-%s je za drug operacijski sistem" -#: lib/problems.c:254 +#: lib/problems.c:247 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s-%s-%s je že nameščen" -#: lib/problems.c:259 +#: lib/problems.c:252 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketa %s ni možno prestaviti\n" -#: lib/problems.c:264 +#: lib/problems.c:257 #, 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/problems.c:269 +#: lib/problems.c:262 #, 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/problems.c:274 +#: lib/problems.c:267 #, 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/problems.c:279 +#: lib/problems.c:272 #, 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/problems.c:289 +#: lib/problems.c:282 #, 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/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " je v sporu z %s-%s-%s\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " potrebuje %s-%s-%s\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je izključen: %s" -#: lib/psm.c:277 +#: lib/psm.c:279 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "premikanje %s v %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "izključevanje datoteke %s%s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "izključevanje datoteke %s%s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "premikanje %s v %s\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "premiokanje imenika %s v %s\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "ni možno ustvariti %s: %s\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "pisanje na %s ni možno" -#: lib/psm.c:1198 +#: lib/psm.c:1200 #, fuzzy msgid "source package expected, binary found\n" msgstr "pričakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:1322 +#: lib/psm.c:1324 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "poganjanje ponamestitvenih skript (če obstajajo)\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skript se ni uspešno izvedel" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skript se ni uspešno izvedel" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "razširitev arhiva je bilo neuspešno%s%s: %s" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspešno odpiranje %s: %s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspešen" @@ -2443,7 +2448,7 @@ msgid "can't query %s: %s\n" msgstr "ni možno poizvedeti o %s: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspešno: %s\n" @@ -2517,7 +2522,7 @@ msgstr "številka zapisa paketa: %d\n" msgid "record %u could not be read\n" msgstr "zapisa %d ni možno prebrati\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni nameščen\n" @@ -2611,7 +2616,7 @@ msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" @@ -2657,7 +2662,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:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni možno namestiti\n" @@ -2675,26 +2680,26 @@ msgstr "neuspešne soodvisnosti:\n" msgid "installing binary packages\n" msgstr "nameščanje binarnih paketov\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "ni možno odpreti datoteke %s: %s\n" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" določa več paketov\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "ni možno odpreti %s: %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "Nameščanje %s\n" @@ -2952,13 +2957,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Dolž. polnila : %d\n" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s preskočen zaradi manjkajoče zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "izključevanje imenika %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -833,7 +833,7 @@ msgstr "Ne mogu da upišem %s" msgid "Could not open %s: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ne mogu da upišem %s" @@ -863,7 +863,7 @@ msgstr "Ne mogu da upišem %s" msgid "Unable to write payload to %s: %s\n" msgstr "Ne mogu da upišem %s" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1644,7 +1644,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2202,184 +2202,189 @@ msgstr "potpiši paket (ukloni tekući potpis)" msgid "generate signature" msgstr "napravi PGP potpis" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " se sudara sa %s-%s-%s\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " je potreban paketu %s-%s-%s\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 +#: lib/problems.c:237 #, fuzzy, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "paket %s-%s-%s sadrži deljene datoteke\n" -#: lib/problems.c:249 +#: lib/problems.c:242 #, fuzzy, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "paket %s-%s-%s sadrži deljene datoteke\n" -#: lib/problems.c:254 +#: lib/problems.c:247 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:259 +#: lib/problems.c:252 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, 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/problems.c:274 +#: lib/problems.c:267 #, 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/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s-%s-%s sadrži deljene datoteke\n" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " se sudara sa %s-%s-%s\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " je potreban paketu %s-%s-%s\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:277 +#: lib/psm.c:279 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:347 +#: lib/psm.c:349 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "greška kod kreiranja direktorijuma %s: %s" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "nemoj izvršiti nijednu fazu" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "neuspelo izvršavanje skripta" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "neuspelo izvršavanje skripta" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paket %s-%s-%s sadrži deljene datoteke\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadrži nijedan paket\n" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" @@ -2430,7 +2435,7 @@ msgid "can't query %s: %s\n" msgstr "greška: ne mogu da otvorim %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" @@ -2504,7 +2509,7 @@ msgstr "pogrešan broj paketa: %s\n" msgid "record %u could not be read\n" msgstr "ne mogu da pročitam slog %d\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -2598,7 +2603,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" @@ -2644,7 +2649,7 @@ msgstr "greška kod kreiranja direktorijuma %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "greška: %s se ne može instalirati\n" @@ -2663,26 +2668,26 @@ msgstr "loše međuzavisnosti:\n" msgid "installing binary packages\n" msgstr "instaliraj paket" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" određuje više paketa\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "uklanjanje oviha paketa će narušiti zavisnosti:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "greška: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" @@ -2943,13 +2948,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "greška kod kreiranja direktorijuma %s: %s" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -825,7 +825,7 @@ msgstr "Kan inte läsa om signaturhuvud.\n" msgid "Could not open %s: %s\n" msgstr "Kunde inte öppna %s: %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunde inte skriva paket: %s\n" @@ -855,7 +855,7 @@ msgstr "Kan inte läsa last frĺn %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Kan inte skriva last till %s: %s\n" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1623,7 +1623,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE antal mĺste vara 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" @@ -2146,184 +2146,189 @@ msgstr "signera ett paket (släng nuvarande signatur)" msgid "generate signature" msgstr "generera signatur" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " stĺr i konflikt med %s-%s-%s\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " behövs av %s-%s-%s\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 -#, c-format -msgid "package %s is for a different architecture" +#: lib/problems.c:237 +#, fuzzy, c-format +msgid "package %s is intended for a %s architecture" msgstr "paket %s är för en annan arkitektur" -#: lib/problems.c:249 -#, c-format -msgid "package %s is for a different operating system" +#: lib/problems.c:242 +#, fuzzy, c-format +msgid "package %s is intended for a %s operating system" msgstr "paket %s är för ett annat operativsystem" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "paket %s är redan installerat" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sökväg %s i paket %s är inte relokerbar" -#: lib/problems.c:264 +#: lib/problems.c:257 #, 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/problems.c:269 +#: lib/problems.c:262 #, 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/problems.c:274 +#: lib/problems.c:267 #, 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/problems.c:279 +#: lib/problems.c:272 #, 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/problems.c:289 +#: lib/problems.c:282 #, 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/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s systemanrop före transaktion: %s misslyckades: %s" -#: lib/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "okänt fel %d uppträdde under behandling av paket %s" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " stĺr i konflikt med %s-%s-%s\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " behövs av %s-%s-%s\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "========== omflyttningar\n" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "%5d utesluter %s\n" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d flyttar om %s -> %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "hoppar över multilib-sökväg %s%s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "hoppar över %s %s\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "flyttar %s till %s\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "flyttar katalogen %s till %s\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan inte skapa %%%s %s\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan inte skriva till %%%s %s\n" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "källpaket innehĺller ingen .spec-fil\n" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kör (eventuellt) %s-skript\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "körning av %s-skript frĺn %s-%s-%s misslyckades, waitpid returnerade %s\n" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "körning av %s-skript frĺn %s-%s-%s misslyckades, slutstatus %d\n" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s har %d filer, test = %d\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr " vid fil " -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades pĺ fil %s: %s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" @@ -2372,7 +2377,7 @@ msgid "can't query %s: %s\n" msgstr "kan inte frĺga %s: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" @@ -2445,7 +2450,7 @@ msgstr "paketpost nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %u kunde inte läsas\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -2539,7 +2544,7 @@ msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" @@ -2584,7 +2589,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:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" @@ -2602,26 +2607,26 @@ msgstr "ouppfyllda beroenden:\n" msgid "installing binary packages\n" msgstr "installerar binärpaket\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan inte öppna filen %s: %s\n" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" @@ -2873,13 +2878,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad pĺ grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -836,7 +836,7 @@ msgstr "%s'den baţlýk okunamadý: %s\n" msgid "Could not open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "paket yazýlamadý: %s\n" @@ -866,7 +866,7 @@ msgstr "%s'den payload okunamadý: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "%s'e payload yazýlamadý: %s\n" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" @@ -1643,7 +1643,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE sayýsý 1 olmalý.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "%d veri türü desteklenmiyor\n" @@ -2170,183 +2170,188 @@ msgstr "paketi imzalar (mevcut imza kaldýrýlýr)" msgid "generate signature" msgstr "imza üretir" -#: lib/problems.c:201 -#, fuzzy -msgid "conflicts with" -msgstr " %s-%s-%s ile çeliţiyor\n" - -#: lib/problems.c:201 -#, fuzzy -msgid "is needed by" -msgstr " %s-%s-%s için gerekli\n" +#. @observer@ +#: lib/problems.c:229 +msgid "different" +msgstr "" -#: lib/problems.c:244 -#, c-format -msgid "package %s is for a different architecture" +#: lib/problems.c:237 +#, fuzzy, c-format +msgid "package %s is intended for a %s architecture" msgstr "%s farklý bir mimari için" -#: lib/problems.c:249 -#, c-format -msgid "package %s is for a different operating system" +#: lib/problems.c:242 +#, fuzzy, c-format +msgid "package %s is intended for a %s operating system" msgstr "%s farklý bir iţletim sistemi için" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "%s zaten kurulu" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%s dosya yolu %s paketinde yeniden konumlandýrýlamaz" -#: lib/problems.c:264 +#: lib/problems.c:257 #, 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/problems.c:269 +#: lib/problems.c:262 #, 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/problems.c:274 +#: lib/problems.c:267 #, 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/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)" -#: lib/problems.c:289 +#: lib/problems.c:282 #, 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/problems.c:294 +#: lib/problems.c:287 #, 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/problems.c:298 +#: lib/problems.c:291 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deđil: %s\n" -#: lib/problems.c:302 +#: lib/problems.c:295 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deđil: %s\n" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "anlaţýlamayan %d hatasý, %s paketi iţlenirken saptandý" -#: lib/psm.c:270 +#: lib/problems.c:380 +#, fuzzy +msgid "conflicts with" +msgstr " %s-%s-%s ile çeliţiyor\n" + +#: lib/problems.c:380 +#, fuzzy +msgid "is needed by" +msgstr " %s-%s-%s için gerekli\n" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "========== yeniden konumlama\n" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "%5d %s'i dýţlýyor\n" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "multilib dosya yolu dýţlanýyor %s%s\n" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "%s %s dýţlanýyor\n" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "%s %s'e konumlanýyor\n" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s dizini %s de yeniden konumlanýyor\n" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s dosyasý oluţturulamýyor: %s\n" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s dosyasýna yazýlamaz %s\n" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalýţtýrýlabilir paketi bulundu\n" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyasý içermiyor\n" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s betiđi çalýţtýrýlýyor (varsa)\n" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "%s betiđinin %s-%s-%s'den icrasý baţarýsýz, waitpid sonucu %s\n" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "%s betiđinin %s-%s-%s'den icrasý baţarýsýz, çýkýţta durum %d\n" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: %s betiđi baţarýsýz (%d), %s-%s-%s atlanýyor\n" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "arţiv paketi açýlýrken baţarýsýz%s%s: %s\n" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr " dosyada " -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baţarýsýz\n" @@ -2395,7 +2400,7 @@ msgid "can't query %s: %s\n" msgstr "%s sorgulanamýyor: %s\n" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açýlamadý: %s\n" @@ -2468,7 +2473,7 @@ msgstr "paket kayýt numarasý: %u\n" msgid "record %u could not be read\n" msgstr "%u. kayýt okunamadý\n" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "%s paketi kurulu deđil\n" @@ -2562,7 +2567,7 @@ msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deđil: %s\n" @@ -2607,7 +2612,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:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "%s yüklenemedi\n" @@ -2625,26 +2630,26 @@ msgstr "bađýmlýlýklarda hata; gerekli paketler:\n" msgid "installing binary packages\n" msgstr "icra edilebilir paketleri kuruluyor\n" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s dosyasý açýlamadý: %s\n" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanýmlýyor\n" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 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:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "%s kuruluyor\n" @@ -2894,13 +2899,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasýndan dolayý %s atlandý\n" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýţlanýyor\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,181 +2105,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2401,7 +2406,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,7 +2496,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2536,7 +2541,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,26 +2559,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2820,13 +2825,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,181 +2105,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2401,7 +2406,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,7 +2496,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2536,7 +2541,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,26 +2559,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2820,13 +2825,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,181 +2105,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2401,7 +2406,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,7 +2496,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2536,7 +2541,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,26 +2559,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2820,13 +2825,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index eef15a11f..670b330d7 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: 2001-11-08 16:51-0500\n" +"POT-Creation-Date: 2001-11-09 12:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2144 +#: build/pack.c:603 lib/psm.c:2146 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2409 +#: build/pack.c:683 lib/psm.c:2411 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,181 +2105,186 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:201 -msgid "conflicts with" +#. @observer@ +#: lib/problems.c:229 +msgid "different" msgstr "" -#: lib/problems.c:201 -msgid "is needed by" -msgstr "" - -#: lib/problems.c:244 +#: lib/problems.c:237 #, c-format -msgid "package %s is for a different architecture" +msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:242 #, c-format -msgid "package %s is for a different operating system" +msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:247 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:252 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:257 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:262 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:274 +#: lib/problems.c:267 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:272 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:289 +#: lib/problems.c:282 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:294 +#: lib/problems.c:287 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:291 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:302 +#: lib/problems.c:295 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:307 +#: lib/problems.c:300 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:270 +#: lib/problems.c:380 +msgid "conflicts with" +msgstr "" + +#: lib/problems.c:380 +msgid "is needed by" +msgstr "" + +#: lib/psm.c:272 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:274 +#: lib/psm.c:276 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:277 +#: lib/psm.c:279 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:347 +#: lib/psm.c:349 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:413 +#: lib/psm.c:415 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:423 +#: lib/psm.c:425 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:502 +#: lib/psm.c:504 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1151 +#: lib/psm.c:1153 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1157 +#: lib/psm.c:1159 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1200 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1322 +#: lib/psm.c:1324 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1432 +#: lib/psm.c:1434 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1600 +#: lib/psm.c:1602 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1607 +#: lib/psm.c:1609 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1949 +#: lib/psm.c:1951 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2066 +#: lib/psm.c:2068 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2180 +#: lib/psm.c:2182 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2189 +#: lib/psm.c:2191 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2232 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2231 +#: lib/psm.c:2233 msgid " on file " msgstr "" -#: lib/psm.c:2417 +#: lib/psm.c:2419 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2420 +#: lib/psm.c:2422 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 -#: lib/rpminstall.c:841 +#: lib/rpminstall.c:840 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2401,7 +2406,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:629 +#: lib/query.c:854 lib/rpminstall.c:628 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,7 +2496,7 @@ msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:552 +#: lib/rpmds.c:554 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2536,7 +2541,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:462 lib/rpminstall.c:697 +#: lib/rpminstall.c:462 lib/rpminstall.c:696 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2554,26 +2559,26 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:562 +#: lib/rpminstall.c:561 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:632 +#: lib/rpminstall.c:631 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:656 +#: lib/rpminstall.c:655 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:683 +#: lib/rpminstall.c:682 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:689 +#: lib/rpminstall.c:688 #, c-format msgid "Installing %s\n" msgstr "" @@ -2820,13 +2825,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:244 +#: lib/transaction.c:249 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:883 +#: lib/transaction.c:902 #, c-format msgid "excluding directory %s\n" msgstr "" |