diff --git a/CHANGES b/CHANGES index 674d406d6..39c621fcc 100644 --- a/CHANGES +++ b/CHANGES @@ -68,6 +68,7 @@ - use TR_REMOVED relations as well as TR_ADDED for ordering. - drop requirement that removed packages immediately follow added. - hybrid chainsaw/presentation ordering algorithm. + - convert file md5sum's to binary on the fly, reducing memory footprint. 4.0.3 -> 4.0.4: diff --git a/build/files.c b/build/files.c index c04635983..1cba159fd 100644 --- a/build/files.c +++ b/build/files.c @@ -17,7 +17,7 @@ #include "buildio.h" #include "myftw.h" -#include "legacy.h" /* XXX mdfile, expandFileList, compressFileList */ +#include "legacy.h" /* XXX domd5, expandFileList, compressFileList */ #include "misc.h" #include "debug.h" @@ -1271,7 +1271,7 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl, buf[0] = '\0'; if (S_ISREG(flp->fl_mode)) - (void) mdfile(flp->diskURL, buf); + (void) domd5(flp->diskURL, buf, 1); s = buf; (void) headerAddOrAppendEntry(h, RPMTAG_FILEMD5S, RPM_STRING_ARRAY_TYPE, &s, 1); diff --git a/lib/depends.c b/lib/depends.c index 6740cda59..cf9e91df0 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -40,7 +40,7 @@ int _cacheDependsRC = 1; int _ts_debug = 0; /*@unchecked@*/ -static int _tso_debug = 1; +static int _tso_debug = 0; /*@observer@*/ /*@unchecked@*/ const char *rpmNAME = PACKAGE; @@ -1321,7 +1321,7 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo Flags = dsiGetFlags(requires); - switch (p->type) { + switch (teGetType(p)) { case TR_REMOVED: /* Skip if not %preun/%postun requires or legacy prereq. */ if (isInstallPreReq(Flags) @@ -1329,7 +1329,7 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo || isLegacyPreReq(Flags) )) /*@innercontinue@*/ continue; - break; + /*@switchbreak@*/ break; case TR_ADDED: /* Skip if not %pre/%post requires or legacy prereq. */ if (isErasePreReq(Flags) @@ -1337,7 +1337,7 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo || isLegacyPreReq(Flags) )) /*@innercontinue@*/ continue; - break; + /*@switchbreak@*/ break; } /* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */ @@ -1352,7 +1352,7 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo Flags = dsiGetFlags(requires); - switch (p->type) { + switch (teGetType(p)) { case TR_REMOVED: /* Skip if %preun/%postun requires or legacy prereq. */ if (isInstallPreReq(Flags) @@ -1360,7 +1360,7 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo || isLegacyPreReq(Flags) )) /*@innercontinue@*/ continue; - break; + /*@switchbreak@*/ break; case TR_ADDED: /* Skip if %pre/%post requires or legacy prereq. */ if (isErasePreReq(Flags) @@ -1368,7 +1368,7 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo || isLegacyPreReq(Flags) )) /*@innercontinue@*/ continue; - break; + /*@switchbreak@*/ break; } /* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */ @@ -1484,7 +1484,7 @@ prtTSI(" p", teGetTSI(p)); while ((p = teNext(pi, oType)) != NULL) { /* Is this element in the queue? */ if (teGetTSI(p)->tsi_reqx == 0) - continue; + /*@innercontinue@*/ continue; tsi->tsi_suc = p; tsi = teGetTSI(p); } @@ -1611,10 +1611,10 @@ prtTSI(" p", teGetTSI(p)); switch (teGetType(p)) { case TR_ADDED: orderList[j].pkgKey = teGetAddedKey(p); - break; + /*@switchbreak@*/ break; case TR_REMOVED: orderList[j].pkgKey = RPMAL_NOMATCH; - break; + /*@switchbreak@*/ break; } orderList[j].orIndex = teiGetOc(pi); j++; diff --git a/lib/fsm.c b/lib/fsm.c index 36286170d..022669a54 100644 --- a/lib/fsm.c +++ b/lib/fsm.c @@ -676,6 +676,7 @@ int fsmMapAttrs(FSM_t fsm) st->st_gid = finalGid; fsm->fmd5sum = (fi->fmd5s ? fi->fmd5s[i] : NULL); + fsm->md5sum = (fi->md5s ? (fi->md5s + (16 * i)) : NULL); } return 0; @@ -691,7 +692,6 @@ static int expandRegular(/*@special@*/ FSM_t fsm) /*@globals fileSystem@*/ /*@modifies fsm, fileSystem @*/ { - const char * fmd5sum; const struct stat * st = &fsm->sb; int left = st->st_size; int rc = 0; @@ -701,9 +701,8 @@ static int expandRegular(/*@special@*/ FSM_t fsm) goto exit; /* XXX md5sum's will break on repackaging that includes modified files. */ - fmd5sum = fsm->fmd5sum; - if (st->st_size > 0 && fmd5sum) + if (st->st_size > 0 && (fsm->fmd5sum || fsm->md5sum)) fdInitDigest(fsm->wfd, PGPHASHALGO_MD5, 0); while (left) { @@ -724,19 +723,26 @@ static int expandRegular(/*@special@*/ FSM_t fsm) (void) fsmStage(fsm, FSM_NOTIFY); } - if (st->st_size > 0 && fmd5sum) { - const char * md5sum = NULL; + if (st->st_size > 0 && (fsm->fmd5sum || fsm->md5sum)) { + void * md5sum = NULL; + int asAscii = (fsm->md5sum == NULL ? 1 : 0); (void) Fflush(fsm->wfd); - fdFiniDigest(fsm->wfd, PGPHASHALGO_MD5, (void **)&md5sum, NULL, 1); + fdFiniDigest(fsm->wfd, PGPHASHALGO_MD5, &md5sum, NULL, asAscii); if (md5sum == NULL) { rc = CPIOERR_MD5SUM_MISMATCH; - } else { - if (strcmp(md5sum, fmd5sum)) - rc = CPIOERR_MD5SUM_MISMATCH; - md5sum = _free(md5sum); + goto exit; } + + if (fsm->md5sum != NULL) { + if (memcmp(md5sum, fsm->md5sum, 16)) + rc = CPIOERR_MD5SUM_MISMATCH; + } else { + if (strcmp(md5sum, fsm->fmd5sum)) + rc = CPIOERR_MD5SUM_MISMATCH; + } + md5sum = _free(md5sum); } exit: diff --git a/lib/fsm.h b/lib/fsm.h index 690703249..d7ef6153b 100644 --- a/lib/fsm.h +++ b/lib/fsm.h @@ -116,54 +116,78 @@ struct fsmIterator_s { * File name and stat information. */ struct fsm_s { -/*@owned@*/ const char * path; /*!< Current file name. */ -/*@owned@*/ const char * opath; /*!< Original file name. */ - FD_t cfd; /*!< Payload file handle. */ - FD_t rfd; /*!< read: File handle. */ -/*@dependent@*/ char * rdbuf; /*!< read: Buffer. */ -/*@owned@*/ char * rdb; /*!< read: Buffer allocated. */ - size_t rdsize; /*!< read: Buffer allocated size. */ - size_t rdlen; /*!< read: Number of bytes requested.*/ - size_t rdnb; /*!< read: Number of bytes returned. */ - FD_t wfd; /*!< write: File handle. */ -/*@dependent@*/ char * wrbuf; /*!< write: Buffer. */ -/*@owned@*/ char * wrb; /*!< write: Buffer allocated. */ - size_t wrsize; /*!< write: Buffer allocated size. */ - size_t wrlen; /*!< write: Number of bytes requested.*/ - size_t wrnb; /*!< write: Number of bytes returned. */ -/*@only@*/ /*@null@*/ FSMI_t iter; /*!< File iterator. */ - int ix; /*!< Current file iterator index. */ -/*@only@*/ struct hardLink * links; /*!< Pending hard linked file(s). */ -/*@only@*/ struct hardLink * li; /*!< Current hard linked file(s). */ -/*@kept@*/ /*@null@*/ unsigned int * archiveSize; /*!< Pointer to archive size. */ -/*@kept@*/ /*@null@*/ const char ** failedFile; /*!< First file name that failed. */ -/*@shared@*/ const char * subdir; /*!< Current file sub-directory. */ -/*@unused@*/ char subbuf[64]; /* XXX eliminate */ -/*@observer@*/ const char * osuffix; /*!< Old, preserved, file suffix. */ -/*@observer@*/ const char * nsuffix; /*!< New, created, file suffix. */ -/*@shared@*/ const char * suffix; /*!< Current file suffix. */ +/*@owned@*/ + const char * path; /*!< Current file name. */ +/*@owned@*/ + const char * opath; /*!< Original file name. */ + FD_t cfd; /*!< Payload file handle. */ + FD_t rfd; /*!< read: File handle. */ +/*@dependent@*/ + char * rdbuf; /*!< read: Buffer. */ +/*@owned@*/ + char * rdb; /*!< read: Buffer allocated. */ + size_t rdsize; /*!< read: Buffer allocated size. */ + size_t rdlen; /*!< read: Number of bytes requested.*/ + size_t rdnb; /*!< read: Number of bytes returned. */ + FD_t wfd; /*!< write: File handle. */ +/*@dependent@*/ + char * wrbuf; /*!< write: Buffer. */ +/*@owned@*/ + char * wrb; /*!< write: Buffer allocated. */ + size_t wrsize; /*!< write: Buffer allocated size. */ + size_t wrlen; /*!< write: Number of bytes requested.*/ + size_t wrnb; /*!< write: Number of bytes returned. */ +/*@only@*/ /*@null@*/ + FSMI_t iter; /*!< File iterator. */ + int ix; /*!< Current file iterator index. */ +/*@only@*/ + struct hardLink * links; /*!< Pending hard linked file(s). */ +/*@only@*/ + struct hardLink * li; /*!< Current hard linked file(s). */ +/*@kept@*/ /*@null@*/ + unsigned int * archiveSize; /*!< Pointer to archive size. */ +/*@kept@*/ /*@null@*/ + const char ** failedFile; /*!< First file name that failed. */ +/*@shared@*/ + const char * subdir; /*!< Current file sub-directory. */ +/*@unused@*/ + char subbuf[64]; /* XXX eliminate */ +/*@observer@*/ + const char * osuffix; /*!< Old, preserved, file suffix. */ +/*@observer@*/ + const char * nsuffix; /*!< New, created, file suffix. */ +/*@shared@*/ + const char * suffix; /*!< Current file suffix. */ char sufbuf[64]; /* XXX eliminate */ -/*@only@*/ /*@null@*/ short * dnlx; /*!< Last dirpath verified indexes. */ -/*@only@*/ /*@null@*/ char * ldn; /*!< Last dirpath verified. */ - int ldnlen; /*!< Last dirpath current length. */ - int ldnalloc; /*!< Last dirpath allocated length. */ - int postpone; /*!< Skip remaining stages? */ - int diskchecked; /*!< Has stat(2) been performed? */ - int exists; /*!< Does current file exist on disk? */ - int mkdirsdone; /*!< Have "orphan" dirs been created? */ - int astriplen; /*!< Length of buildroot prefix. */ - int rc; /*!< External file stage return code. */ - int commit; /*!< Commit synchronously? */ - cpioMapFlags mapFlags; /*!< Bit(s) to control mapping. */ -/*@shared@*/ const char * dirName; /*!< File directory name. */ -/*@shared@*/ const char * baseName; /*!< File base name. */ -/*@shared@*/ const char * fmd5sum; /*!< File MD5 sum (NULL disables). */ - unsigned fflags; /*!< File flags. */ - fileAction action; /*!< File disposition. */ - fileStage goal; /*!< Package state machine goal. */ - fileStage stage; /*!< External file stage. */ - struct stat sb; /*!< Current file stat(2) info. */ - struct stat osb; /*!< Original file stat(2) info. */ +/*@only@*/ /*@null@*/ + short * dnlx; /*!< Last dirpath verified indexes. */ +/*@only@*/ /*@null@*/ + char * ldn; /*!< Last dirpath verified. */ + int ldnlen; /*!< Last dirpath current length. */ + int ldnalloc; /*!< Last dirpath allocated length. */ + int postpone; /*!< Skip remaining stages? */ + int diskchecked; /*!< Has stat(2) been performed? */ + int exists; /*!< Does current file exist on disk? */ + int mkdirsdone; /*!< Have "orphan" dirs been created? */ + int astriplen; /*!< Length of buildroot prefix. */ + int rc; /*!< External file stage return code. */ + int commit; /*!< Commit synchronously? */ + cpioMapFlags mapFlags; /*!< Bit(s) to control mapping. */ +/*@shared@*/ + const char * dirName; /*!< File directory name. */ +/*@shared@*/ + const char * baseName; /*!< File base name. */ +/*@shared@*/ + const char * fmd5sum; /*!< Hex MD5 sum (NULL disables). */ +/*@shared@*/ + const char * md5sum; /*!< Binary MD5 sum (NULL disables). */ + + unsigned fflags; /*!< File flags. */ + fileAction action; /*!< File disposition. */ + fileStage goal; /*!< Package state machine goal. */ + fileStage stage; /*!< External file stage. */ + struct stat sb; /*!< Current file stat(2) info. */ + struct stat osb; /*!< Original file stat(2) info. */ }; #ifdef __cplusplus diff --git a/lib/rpmfi.c b/lib/rpmfi.c index fb58f724c..4eb83e3de 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -707,6 +707,7 @@ fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, fi->Type, fi->fc); fi->flinks = hfd(fi->flinks, -1); fi->flangs = hfd(fi->flangs, -1); fi->fmd5s = hfd(fi->fmd5s, -1); + fi->md5s = _free(fi->md5s); fi->fuser = hfd(fi->fuser, -1); fi->fuids = _free(fi->fuids); @@ -756,6 +757,18 @@ fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, fi->Type, fi->fc); return NULL; } +static inline unsigned char nibble(char c) + /*@*/ +{ + if (c >= '0' && c <= '9') + return (c - '0'); + if (c >= 'A' && c <= 'F') + return (c - 'A') + 10; + if (c >= 'a' && c <= 'f') + return (c - 'a') + 10; + return 0; +} + #define _fdupe(_fi, _data) \ if ((_fi)->_data != NULL) \ (_fi)->_data = memcpy(xmalloc((_fi)->fc * sizeof(*(_fi)->_data)), \ @@ -766,10 +779,12 @@ TFI_t fiNew(rpmTransactionSet ts, TFI_t fi, { HGE_t hge = (scareMem ? (HGE_t) headerGetEntryMinMemory : (HGE_t) headerGetEntry); + HFD_t hfd = headerFreeData; const char * Type; uint_32 * uip; int malloced = 0; int dnlmax, bnlmax; + unsigned char * t; int len; int xx; int i; @@ -849,6 +864,16 @@ TFI_t fiNew(rpmTransactionSet ts, TFI_t fi, xx = hge(h, RPMTAG_FILELANGS, NULL, (void **) &fi->flangs, NULL); xx = hge(h, RPMTAG_FILEMD5S, NULL, (void **) &fi->fmd5s, NULL); + fi->md5s = t = xmalloc(fi->fc * 16); + for (i = 0; i < fi->fc; i++) { + const char * fmd5; + int j; + + fmd5 = fi->fmd5s[i]; + for (j = 0; j < 16; j++, t++, fmd5 += 2) + *t = (nibble(fmd5[0]) << 4) | nibble(fmd5[1]); + } + fi->fmd5s = hfd(fi->fmd5s, -1); /* XXX TR_REMOVED doesn;t need fmtimes or frdevs */ xx = hge(h, RPMTAG_FILEMTIMES, NULL, (void **) &fi->fmtimes, NULL); @@ -903,7 +928,7 @@ if (_fi_debug < 0) fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, Type, (fi ? fi->fc : 0)); /*@=modfilesystem@*/ - /*@-nullstate@*/ /* FIX: TFI null annotations */ + /*@-compdef -nullstate@*/ /* FIX: TFI null annotations */ return rpmfiLink(fi, (fi ? fi->Type : NULL)); - /*@=nullstate@*/ + /*@=compdef =nullstate@*/ } diff --git a/lib/rpmfi.h b/lib/rpmfi.h index 94e0b593f..cf6379ae2 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -43,7 +43,7 @@ struct TFI_s { /*@only@*/ /*?null?*/ const char ** flinks; /*!< File link(s) (from header) */ /*@only@*/ /*@null@*/ - const char ** flangs; /*!< File lang(s) */ + const char ** flangs; /*!< File lang(s) (from header) */ /*@only@*/ /*?null?*/ uint_32 * dil; /*!< Directory indice(s) (from header) */ @@ -59,9 +59,9 @@ struct TFI_s { const uint_16 * frdevs; /*!< File rdev(s) (from header) */ /*@only@*/ /*@null@*/ - const char ** fuser; /*!< File owner(s) */ + const char ** fuser; /*!< File owner(s) (from header) */ /*@only@*/ /*@null@*/ - const char ** fgroup; /*!< File group(s) */ + const char ** fgroup; /*!< File group(s) (from header) */ /*@only@*/ /*@null@*/ uid_t * fuids; /*!< File uid(s) */ /*@only@*/ /*@null@*/ @@ -98,6 +98,9 @@ struct TFI_s { /*@unused@*/ int_32 * odil; /*!< Original dirindex(s) (from header) */ +/*@only@*/ /*@null@*/ + unsigned char * md5s; /*!< File md5 sums in binary. */ + /*@only@*/ /*@null@*/ char * fn; /*!< File name buffer. */ int fnlen; /*!< FIle name buffer length. */ diff --git a/lib/rpmlib.h b/lib/rpmlib.h index ddee2c634..3512deee9 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -1554,7 +1554,9 @@ typedef enum rpmtransFlags_e { /*@=enummemuse@*/ RPMTRANS_FLAG_APPLYONLY = (1 << 25), +/*@-enummemuse@*/ RPMTRANS_FLAG_CHAINSAW = (1 << 26), +/*@=enummemuse@*/ } rpmtransFlags; #define _noTransScripts \ diff --git a/lib/transaction.c b/lib/transaction.c index 7ddefc8fa..26192f058 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -6,12 +6,11 @@ #include /* XXX for rpmExpand */ - #define _NEED_TEITERATOR 1 #include "psm.h" #include "fprint.h" -#include "legacy.h" /* XXX mdfile */ +#include "legacy.h" /* XXX domd5 */ #include "misc.h" /* XXX stripTrailingChar, splitString, currentDirectory */ #include "rpmdb.h" @@ -156,19 +155,16 @@ static int sharedCmp(const void * one, const void * two) /** */ -static fileAction decideFileFate(const char * fn, - short dbMode, - const char * dbMd5, const char * dbLink, short newMode, - const char * newMd5, const char * newLink, int newFlags, - rpmtransFlags transFlags) +static fileAction decideFileFate(const rpmTransactionSet ts, + const TFI_t ofi, TFI_t nfi) /*@globals fileSystem @*/ - /*@modifies fileSystem @*/ + /*@modifies nfi, fileSystem @*/ { + const char * fn = tfiGetFN(nfi); + int newFlags = tfiGetFFlags(nfi); char buffer[1024]; - const char * dbAttr, * newAttr; fileTypes dbWhat, newWhat, diskWhat; struct stat sb; - int i, rc; int save = (newFlags & RPMFILE_NOREPLACE) ? FA_ALTNAME : FA_SAVE; if (lstat(fn, &sb)) { @@ -176,8 +172,9 @@ static fileAction decideFileFate(const char * fn, * The file doesn't exist on the disk. Create it unless the new * package has marked it as missingok, or allfiles is requested. */ - if (!(transFlags & RPMTRANS_FLAG_ALLFILES) && - (newFlags & RPMFILE_MISSINGOK)) { + if (!(ts->transFlags & RPMTRANS_FLAG_ALLFILES) + && (newFlags & RPMFILE_MISSINGOK)) + { rpmMessage(RPMMESS_DEBUG, _("%s skipped due to missingok flag\n"), fn); return FA_SKIP; @@ -187,58 +184,59 @@ static fileAction decideFileFate(const char * fn, } diskWhat = whatis(sb.st_mode); - dbWhat = whatis(dbMode); - newWhat = whatis(newMode); + dbWhat = whatis(ofi->fmodes[ofi->i]); + newWhat = whatis(nfi->fmodes[nfi->i]); - /* RPM >= 2.3.10 shouldn't create config directories -- we'll ignore - them in older packages as well */ - if (newWhat == XDIR) { + /* + * RPM >= 2.3.10 shouldn't create config directories -- we'll ignore + * them in older packages as well. + */ + if (newWhat == XDIR) return FA_CREATE; - } - if (diskWhat != newWhat) { + if (diskWhat != newWhat) return save; - } else if (newWhat != dbWhat && diskWhat != dbWhat) { + else if (newWhat != dbWhat && diskWhat != dbWhat) return save; - } else if (dbWhat != newWhat) { + else if (dbWhat != newWhat) return FA_CREATE; - } else if (dbWhat != LINK && dbWhat != REG) { + else if (dbWhat != LINK && dbWhat != REG) return FA_CREATE; - } + /* + * This order matters - we'd prefer to CREATE the file if at all + * possible in case something else (like the timestamp) has changed. + */ if (dbWhat == REG) { - rc = mdfile(fn, buffer); - - if (rc) { - /* assume the file has been removed, don't freak */ - return FA_CREATE; + if (ofi->md5s != NULL && nfi->md5s != NULL) { + const unsigned char * omd5 = ofi->md5s + (16 * ofi->i); + const unsigned char * nmd5 = nfi->md5s + (16 * nfi->i); + if (domd5(fn, buffer, 0)) + return FA_CREATE; /* assume file has been removed */ + if (!memcmp(omd5, buffer, 16)) + return FA_CREATE; /* unmodified config file, replace. */ + if (!memcmp(omd5, nmd5, 16)) + return FA_SKIP; /* identical file, don't bother. */ + } else { + const char * omd5 = ofi->fmd5s[ofi->i]; + const char * nmd5 = nfi->fmd5s[nfi->i]; + if (domd5(fn, buffer, 1)) + return FA_CREATE; /* assume file has been removed */ + if (!strcmp(omd5, buffer)) + return FA_CREATE; /* unmodified config file, replace. */ + if (!strcmp(omd5, nmd5)) + return FA_SKIP; /* identical file, don't bother. */ } - dbAttr = dbMd5; - newAttr = newMd5; } else /* dbWhat == LINK */ { memset(buffer, 0, sizeof(buffer)); - i = readlink(fn, buffer, sizeof(buffer) - 1); - if (i == -1) { - /* assume the file has been removed, don't freak */ - return FA_CREATE; - } - dbAttr = dbLink; - newAttr = newLink; + if (readlink(fn, buffer, sizeof(buffer) - 1) == -1) + return FA_CREATE; /* assume file has been removed */ + if (!strcmp(ofi->flinks[ofi->i], buffer)) + return FA_CREATE; /* unmodified config file, replace. */ + if (!strcmp(ofi->flinks[ofi->i], nfi->flinks[nfi->i])) + return FA_SKIP; /* identical file, don't bother. */ } - /* this order matters - we'd prefer to CREATE the file if at all - possible in case something else (like the timestamp) has changed */ - - if (!strcmp(dbAttr, buffer)) { - /* this config file has never been modified, so just replace it */ - return FA_CREATE; - } - - if (!strcmp(dbAttr, newAttr)) { - /* this file is the same in all versions of this package */ - return FA_SKIP; - } - /* * The config file on the disk has been modified, but * the ones in the two packages are different. It would @@ -250,19 +248,29 @@ static fileAction decideFileFate(const char * fn, /** */ -static int filecmp(short mode1, const char * md51, const char * link1, - short mode2, const char * md52, const char * link2) +static int filecmp(TFI_t afi, TFI_t bfi) /*@*/ { - fileTypes what1 = whatis(mode1); - fileTypes what2 = whatis(mode2); + fileTypes awhat = whatis(afi->fmodes[afi->i]); + fileTypes bwhat = whatis(bfi->fmodes[bfi->i]); - if (what1 != what2) return 1; + if (awhat != bwhat) return 1; - if (what1 == LINK) - return strcmp(link1, link2); - else if (what1 == REG) - return strcmp(md51, md52); + if (awhat == LINK) { + const char * alink = afi->flinks[afi->i]; + const char * blink = bfi->flinks[bfi->i]; + return strcmp(alink, blink); + } else if (awhat == REG) { + if (afi->md5s != NULL && bfi->md5s != NULL) { + const unsigned char * amd5 = afi->md5s + (16 * afi->i); + const unsigned char * bmd5 = bfi->md5s + (16 * bfi->i); + return memcmp(amd5, bmd5, 16); + } else { + const char * amd5 = afi->fmd5s[afi->i]; + const char * bmd5 = bfi->fmd5s[bfi->i]; + return strcmp(amd5, bmd5); + } + } return 0; } @@ -277,74 +285,57 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts, /*@globals fileSystem @*/ /*@modifies ts, fi, fileSystem @*/ { - HGE_t hge = fi->hge; - HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData); - rpmtransFlags transFlags = ts->transFlags; - rpmTagType oltype, omtype; - Header h; - int i; - const char ** otherMd5s; - const char ** otherLinks; - const char * otherStates; - uint_32 * otherFlags; - uint_32 * otherSizes; - uint_16 * otherModes; + const char * altNEVR = NULL; + TFI_t otherFi = NULL; int numReplaced = 0; - int xx; + int i; - rpmdbMatchIterator mi; + { rpmdbMatchIterator mi; + Header h; + int scareMem = 0; - mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, + mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &shared->otherPkg, sizeof(shared->otherPkg)); - h = rpmdbNextIterator(mi); - if (h == NULL) { + while ((h = rpmdbNextIterator(mi)) != NULL) { + altNEVR = hGetNEVR(h, NULL); + otherFi = fiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem); + break; + } mi = rpmdbFreeIterator(mi); - return 1; } - xx = hge(h, RPMTAG_FILEMD5S, &omtype, (void **) &otherMd5s, NULL); - xx = hge(h, RPMTAG_FILELINKTOS, &oltype, (void **) &otherLinks, NULL); - xx = hge(h, RPMTAG_FILESTATES, NULL, (void **) &otherStates, NULL); - xx = hge(h, RPMTAG_FILEMODES, NULL, (void **) &otherModes, NULL); - xx = hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &otherFlags, NULL); - xx = hge(h, RPMTAG_FILESIZES, NULL, (void **) &otherSizes, NULL); + if (otherFi == NULL) + return 1; fi->replaced = xcalloc(sharedCount, sizeof(*fi->replaced)); for (i = 0; i < sharedCount; i++, shared++) { int otherFileNum, fileNum; - const char * fn; otherFileNum = shared->otherFileNum; + (void) tfiSetFX(otherFi, otherFileNum); + fileNum = shared->pkgFileNum; - (void) tfiSetFX(fi, fileNum); - fn = tfiGetFN(fi); +#ifdef DYING /* XXX another tedious segfault, assume file state normal. */ if (otherStates && otherStates[otherFileNum] != RPMFILE_STATE_NORMAL) continue; +#endif if (XFA_SKIPPING(fi->actions[fileNum])) continue; - if (filecmp(otherModes[otherFileNum], - otherMd5s[otherFileNum], - otherLinks[otherFileNum], - fi->fmodes[fileNum], - fi->fmd5s[fileNum], - fi->flinks[fileNum])) { + if (filecmp(otherFi, fi)) { if (reportConflicts) { - const char * altNEVR = hGetNEVR(h, NULL); rpmProblemSetAppend(ts->probs, RPMPROB_FILE_CONFLICT, teGetNEVR(p), teGetKey(p), tfiGetDN(fi), tfiGetBN(fi), altNEVR, 0); - altNEVR = _free(altNEVR); } - if (!(otherFlags[otherFileNum] | fi->fflags[fileNum]) - & RPMFILE_CONFIG) { + if (!(tfiGetFFlags(otherFi) | tfiGetFFlags(fi)) & RPMFILE_CONFIG) { /*@-assignexpose@*/ /* FIX: p->replaced, not fi */ if (!shared->isRemoved) fi->replaced[numReplaced++] = *shared; @@ -352,24 +343,17 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts, } } - if ((otherFlags[otherFileNum] | fi->fflags[fileNum]) & RPMFILE_CONFIG) { - fi->actions[fileNum] = decideFileFate(fn, - otherModes[otherFileNum], - otherMd5s[otherFileNum], - otherLinks[otherFileNum], - fi->fmodes[fileNum], - fi->fmd5s[fileNum], - fi->flinks[fileNum], - fi->fflags[fileNum], - transFlags); + if ((tfiGetFFlags(otherFi) | tfiGetFFlags(fi)) & RPMFILE_CONFIG) { + fileAction action; + action = decideFileFate(ts, otherFi, fi); + fi->actions[fileNum] = action; } + fi->replacedSizes[fileNum] = otherFi->fsizes[otherFi->i]; - fi->replacedSizes[fileNum] = otherSizes[otherFileNum]; } - otherMd5s = hfd(otherMd5s, omtype); - otherLinks = hfd(otherLinks, oltype); - mi = rpmdbFreeIterator(mi); + altNEVR = _free(altNEVR); + otherFi = fiFree(otherFi, 1); fi->replaced = xrealloc(fi->replaced, /* XXX memory leak */ sizeof(*fi->replaced) * (numReplaced + 1)); @@ -647,6 +631,7 @@ static void handleOverlappedFiles(const rpmTransactionSet ts, otherFc = tfiGetFC(otherFi); otherFileNum = findFps(fiFps, otherFps, otherFc); + (void) tfiSetFX(otherFi, otherFileNum); /* XXX is this test still necessary? */ if (otherFi->actions[otherFileNum] != FA_UNKNOWN) @@ -660,10 +645,10 @@ static void handleOverlappedFiles(const rpmTransactionSet ts, /* XXX is this test still necessary? */ if (fi->actions[i] != FA_UNKNOWN) /*@switchbreak@*/ break; - if ((fi->fflags[i] & RPMFILE_CONFIG) && + if ((tfiGetFFlags(fi) & RPMFILE_CONFIG) && !lstat(fn, &sb)) { /* Here is a non-overlapped pre-existing config file. */ - fi->actions[i] = (fi->fflags[i] & RPMFILE_NOREPLACE) + fi->actions[i] = (tfiGetFFlags(fi) & RPMFILE_NOREPLACE) ? FA_ALTNAME : FA_BACKUP; } else { fi->actions[i] = FA_CREATE; @@ -674,12 +659,7 @@ static void handleOverlappedFiles(const rpmTransactionSet ts, assert(otherFi != NULL); /* Mark added overlapped non-identical files as a conflict. */ if ((ts->ignoreSet & RPMPROB_FILTER_REPLACENEWFILES) - && filecmp(otherFi->fmodes[otherFileNum], - otherFi->fmd5s[otherFileNum], - otherFi->flinks[otherFileNum], - fi->fmodes[i], - fi->fmd5s[i], - fi->flinks[i])) + && filecmp(otherFi, fi)) { rpmProblemSetAppend(ts->probs, RPMPROB_NEW_FILE_CONFLICT, teGetNEVR(p), teGetKey(p), @@ -691,9 +671,9 @@ assert(otherFi != NULL); /* Try to get the disk accounting correct even if a conflict. */ fixupSize = otherFi->fsizes[otherFileNum]; - if ((fi->fflags[i] & RPMFILE_CONFIG) && !lstat(fn, &sb)) { + if ((tfiGetFFlags(fi) & RPMFILE_CONFIG) && !lstat(fn, &sb)) { /* Here is an overlapped pre-existing config file. */ - fi->actions[i] = (fi->fflags[i] & RPMFILE_NOREPLACE) + fi->actions[i] = (tfiGetFFlags(fi) & RPMFILE_NOREPLACE) ? FA_ALTNAME : FA_SKIP; } else { fi->actions[i] = FA_CREATE; @@ -716,16 +696,25 @@ assert(otherFi != NULL); /*@switchbreak@*/ break; if (fi->fstates && fi->fstates[i] != RPMFILE_STATE_NORMAL) /*@switchbreak@*/ break; - if (!(S_ISREG(fi->fmodes[i]) && (fi->fflags[i] & RPMFILE_CONFIG))) { + if (!(S_ISREG(fi->fmodes[i]) && (tfiGetFFlags(fi) & RPMFILE_CONFIG))) { fi->actions[i] = FA_ERASE; /*@switchbreak@*/ break; } /* Here is a pre-existing modified config file that needs saving. */ - { char mdsum[50]; - if (!mdfile(fn, mdsum) && strcmp(fi->fmd5s[i], mdsum)) { - fi->actions[i] = FA_BACKUP; - /*@switchbreak@*/ break; + { char md5sum[50]; + if (fi->md5s != NULL) { + const unsigned char * fmd5 = fi->md5s + (16 * i); + if (!domd5(fn, md5sum, 0) && memcmp(fmd5, md5sum, 16)) { + fi->actions[i] = FA_BACKUP; + /*@switchbreak@*/ break; + } + } else { + const char * fmd5 = fi->fmd5s[i]; + if (!domd5(fn, md5sum, 1) && strcmp(fmd5, md5sum)) { + fi->actions[i] = FA_BACKUP; + /*@switchbreak@*/ break; + } } } fi->actions[i] = FA_ERASE; @@ -949,7 +938,7 @@ static void skipFiles(const rpmTransactionSet ts, TFI_t fi) /* * Skip documentation if requested. */ - if (noDocs && (fi->fflags[i] & RPMFILE_DOC)) { + if (noDocs && (tfiGetFFlags(fi) & RPMFILE_DOC)) { drc[ix]--; dff[ix] = 1; fi->actions[i] = FA_SKIPNSTATE; continue; diff --git a/lib/verify.c b/lib/verify.c index 3ab0c8706..13a30e3ee 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -8,7 +8,7 @@ #include "psm.h" #include -#include "legacy.h" /* XXX mdfile(), uidToUname(), gnameToGid */ +#include "legacy.h" /* XXX domd5(), uidToUname(), gnameToGid */ #include "ugid.h" #include "misc.h" /* XXX for uidToUname() and gnameToGid() */ #include "debug.h" @@ -148,7 +148,7 @@ int rpmVerifyFile(const char * root, Header h, int filenum, if (!hge(h, RPMTAG_FILEMD5S, &mdt, (void **) &md5List, NULL)) *result |= RPMVERIFY_MD5; else { - rc = mdfile(filespec, md5sum); + rc = domd5(filespec, md5sum, 1); if (rc) *result |= (RPMVERIFY_READFAIL|RPMVERIFY_MD5); else if (strcmp(md5sum, md5List[filenum])) diff --git a/po/cs.po b/po/cs.po index 3facdae01..443ff0e00 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -1432,89 +1432,89 @@ msgstr "" msgid " failed - " msgstr "selhal - " -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít databázi balíèkù v %s\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "¹patný db soubor %s\n" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "NE " -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "ANO" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1573,37 +1573,37 @@ msgstr "========= Adres msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "vytvoøen adresáø %s s právy %04o.\n" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "%s ulo¾eno jako %s\n" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s odstranìní %s selhalo: Adresáø není prázdný\n" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir %s selhal: %s\n" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink %s selhal: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "%s vytvoøen jako %s\n" @@ -2832,18 +2832,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, 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:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresáø %s\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "získávám seznam pøipojených systémù souborù\n" diff --git a/po/da.po b/po/da.po index 3cbc749e9..af885f098 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -1433,89 +1433,89 @@ msgstr "" msgid " failed - " msgstr " mislykkedes - " -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kunne ikke åbne Packages-database i %s\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "ugyldig db-fil %s\n" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1573,37 +1573,37 @@ msgstr "" msgid "%10d %s\n" msgstr "linie %d: %s\n" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "%s gemt som %s\n" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "kan ikke fjerne %s - katalog ikke tomt\n" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "fjernelse (rmdir) af %s mislykkedes: %s\n" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "%s oprettet som %s\n" @@ -2854,18 +2854,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterede filsystemer\n" diff --git a/po/de.po b/po/de.po index a79e74a1d..2dc8c83f1 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -1568,90 +1568,90 @@ msgstr "" msgid " failed - " msgstr "pgp fehlgeschlagen" -#: lib/depends.c:101 +#: lib/depends.c:104 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" # , c-format -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" # FIXME -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1713,37 +1713,37 @@ msgstr "" msgid "%10d %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "kann %s nicht entfernen - Verzeichnis ist nicht leer" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "Entfernen von %s fehlgeschlagen: %s" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "kann Datei %s nicht öffnen: " @@ -3049,18 +3049,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/en_RN.po b/po/en_RN.po index 493b20d6a..ce77e1b8b 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-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,83 +1410,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2777,18 +2777,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/es.po b/po/es.po index 493b20d6a..ce77e1b8b 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,83 +1410,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2777,18 +2777,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index 493b20d6a..ce77e1b8b 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-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,83 +1410,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2777,18 +2777,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 83ecadee0..b7380c07d 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -1451,88 +1451,88 @@ msgstr "" msgid " failed - " msgstr "pgp epäonnistui" -#: lib/depends.c:101 +#: lib/depends.c:104 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "en voinut avata %s: %s" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1590,37 +1590,37 @@ msgstr "" msgid "%10d %s\n" msgstr "en voinut avata %s: %s" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "en voi poistaa %s -hakemisto ei ole tyhjä" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s:n rmdir epäonnistui: %s" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "en voinut avata tiedostoa %s: " @@ -2901,18 +2901,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 7f3924445..916659520 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1491,85 +1491,85 @@ msgstr "" msgid " failed - " msgstr "La construction a chou.\n" -#: lib/depends.c:101 +#: lib/depends.c:104 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1625,37 +1625,37 @@ msgstr "" msgid "%10d %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -2944,18 +2944,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 6632b18b4..8443a1ecf 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -1405,83 +1405,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1537,37 +1537,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2772,18 +2772,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index 493b20d6a..ce77e1b8b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,83 +1410,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2777,18 +2777,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/id.po b/po/id.po index 493b20d6a..ce77e1b8b 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,83 +1410,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2777,18 +2777,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/is.po b/po/is.po index 254eb2c55..c56f087ed 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -1410,84 +1410,84 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "uppfæra pakka" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1543,37 +1543,37 @@ msgstr "" msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "%s vistað sem %s\n" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir %s brást: %s\n" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s gat ekki eytt %s: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "%s búið til sem %s\n" @@ -2783,18 +2783,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/it.po b/po/it.po index 493b20d6a..ce77e1b8b 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,83 +1410,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2777,18 +2777,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 1a98cf169..39677908b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -1483,88 +1483,88 @@ msgstr "" msgid " failed - " msgstr "¼ºÇÔ - " -#: lib/depends.c:101 +#: lib/depends.c:104 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1622,37 +1622,37 @@ msgstr "" msgid "%10d %s\n" msgstr "%d ¹ÔÌÜ: %s" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Þ¤¹" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó - ¥Ç¥£¥ì¥¯¥È¥ê¤¬¶õ¤Ç¤¢¤ê¤Þ¤»¤ó" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s ¤Î rmdir ¤Ë¼ºÇÔ: %s" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤¹" @@ -2961,18 +2961,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "½ð̾¥Ñ¥Ã¥É: %d\n" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n" diff --git a/po/ko.po b/po/ko.po index 8705aeef3..ecb21ae0e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -1423,89 +1423,89 @@ msgstr " msgid " failed - " msgstr " ½ÇÆÐÇÔ - " -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "¿¹" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1564,37 +1564,37 @@ msgstr "========= msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%04o Çã°¡±Ç(perms)ÀÇ %s µð·ºÅ丮°¡ »ý¼ºµÇ¾ú½À´Ï´Ù.\n" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "Çì´õ ÆÄÀÏ ¸ñ·Ï¿¡¼­ ¾ÆÄ«À̺ê ÆÄÀÏ %s (À»)¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "%s (ÀÌ)°¡ %s (À¸)·Î ÀúÀåµÇ¾ú½À´Ï´Ù\n" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s %s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: ºó µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù\n" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s %s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s %s ¸µÅ©¸¦ ÇØÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "%s (ÀÌ)°¡ %s (À¸)·Î »ý¼ºµÇ¾ú½À´Ï´Ù\n" @@ -2837,18 +2837,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "¸¶¿îÆ®µÈ ÆÄÀϽýºÅÛÀÇ ¸ñ·ÏÀ» ¼öÁýÇÏ°í ÀÖ½À´Ï´Ù\n" diff --git a/po/no.po b/po/no.po index b34cd5f75..6ca73cac8 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -1424,84 +1424,84 @@ msgstr "" msgid " failed - " msgstr " feilet - " -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "NEI" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "JA" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1557,37 +1557,37 @@ msgstr "" msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "%s lagret som %s\n" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir av %s feilet: Katalogen er ikke tom\n" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir av %s feilet: %s\n" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink av %s feilet: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "%s opprettet som %s\n" @@ -2809,18 +2809,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterte filsystemer\n" diff --git a/po/pl.po b/po/pl.po index 90ba3118b..c68d068b4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -1465,89 +1465,89 @@ msgstr "" msgid " failed - " msgstr " nie powiod³o siê -" -#: lib/depends.c:101 +#: lib/depends.c:104 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "b³êdny status pliku: %s" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "Udostêpniane zasoby:" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "znaleziono %d pakietów\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1605,37 +1605,37 @@ msgstr "" msgid "%10d %s\n" msgstr "linia %d: %s" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "ostrze¿enie: %s zapisany jako %s" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "nie mo¿na usun±æ %s - katalog nie jest pusty" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "skasowanie katalogu %s nie powiod³o siê" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "ostrze¿enie: %s utworzony jako %s" @@ -2914,18 +2914,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/pt.po b/po/pt.po index cdc1324ed..7c6f298e8 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 2000-06-22 01:13+01:00\n" "Last-Translator: José Nuno Coelho Sanarra Pires\n" "Language-Team: pt \n" @@ -1420,89 +1420,89 @@ msgstr "" msgid " failed - " msgstr " falhou - " -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "não consigo abrir a base de dados Packages em %s\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "o pacote %s já está instalado" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "ficheiro db inválido %s\n" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "nenhum pacote\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) adicionado à cache de dependências.\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 #, fuzzy msgid "NO " msgstr "NÃO-OK" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1560,37 +1560,37 @@ msgstr "" msgid "%10d %s\n" msgstr "linha %d: %s\n" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "%s gravado como %s\n" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "não consigo remover a %s - a directoria não está vazia\n" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "o rmdir da %s falhou: %s\n" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "o acesso ao %s falhou: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "%s criado como %s\n" @@ -2828,18 +2828,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "'Pad' ou preenchimento da assinatura: %d\n" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido à opção missingok\n" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "a obter a lista dos sistemas de ficheiros montados\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0a6b21f76..4470e1973 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-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" #: build.c:36 #, fuzzy @@ -1578,87 +1578,87 @@ msgid " failed - " msgstr "Construo falhou.\n" # , c-format -#: lib/depends.c:101 +#: lib/depends.c:104 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" # , c-format -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" # , c-format -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1718,40 +1718,40 @@ msgstr "" msgid "%10d %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" # , c-format -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "No consegui abrir: %s\n" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "Construo falhou.\n" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "Construo falhou.\n" # , c-format -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "No consegui abrir: %s\n" @@ -3065,7 +3065,7 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3079,12 +3079,12 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index 86e38f523..6605ff372 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -1405,83 +1405,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1537,37 +1537,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2772,18 +2772,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index fb8d92fbb..fe97616bc 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-18 06:36-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2777,18 +2777,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index f5f73da43..b276188a0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -1441,90 +1441,90 @@ msgstr " msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "îåT" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "äá" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1583,37 +1583,37 @@ msgstr "========= msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "ËÁÔÁÌÏÇ %s ÓÏÚÄÁÎ Ó ÐÒÁ×ÁÍÉ ÄÏÓÔÕÐÁ %04o.\n" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "ÆÁÊÌ ÁÒÈÉ×Á %s ÎÅ ÎÁÊÄÅÎ × ÓÐÉÓËÅ ÆÁÊÌÏ× ÚÁÇÏÌÏ×ËÁ\n" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "%s ÓÏÈÒÁÎÅÎ ËÁË %s\n" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: ËÁÔÁÌÏÇ ÎÅ ÐÕÓÔ\n" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "%s ÓÏÚÄÁÎ ËÁË %s\n" @@ -2845,18 +2845,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "ÐÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n" diff --git a/po/sk.po b/po/sk.po index 380cee046..a12a16fd9 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -1464,89 +1464,89 @@ msgstr "" msgid " failed - " msgstr " zlyhalo - " -#: lib/depends.c:101 +#: lib/depends.c:104 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "chybný stav súboru: %s" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "Poskytuje:" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "nájdených %d balíkov\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1604,37 +1604,37 @@ msgstr "" msgid "%10d %s\n" msgstr "riadok %d: %s" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "varovanie: %s uchovaný ako %s" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "nie je mo¾né odstráni» %s - adresár nie je prázdny" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "rmdir %s zlyhalo: %s" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "varovanie: %s vytvorené ako %s" @@ -2911,18 +2911,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/sl.po b/po/sl.po index 3de7913bb..e5febc17a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.210 2001/11/17 20:44:41 jbj Exp $ +# $Id: sl.po,v 1.211 2001/11/18 17:49:46 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -1465,89 +1465,89 @@ msgstr "" msgid " failed - " msgstr " neuspe¹no - " -#: lib/depends.c:101 +#: lib/depends.c:104 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1605,37 +1605,37 @@ msgstr "" msgid "%10d %s\n" msgstr "vrstica %d: %s" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "opozorilo: %s shranjen kot %s" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "ni mo¾no odstraniti %s - imenik ni prazen" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "odstranitev imenika %s je bila neuspe¹na: %s" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "opozorilo: %s ustvarjen kot %s" @@ -2909,18 +2909,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n" diff --git a/po/sr.po b/po/sr.po index 6d42c4fb3..11dce04db 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -1449,88 +1449,88 @@ msgstr "" msgid " failed - " msgstr "PGP omanuo" -#: lib/depends.c:101 +#: lib/depends.c:104 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1588,37 +1588,37 @@ msgstr "" msgid "%10d %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "ne mogu da uklonim %s - direktorijum nije prazan" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "neuspela komanda rmdir %s: %s" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " @@ -2900,18 +2900,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index ee5a59597..95b60eea4 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -1426,89 +1426,89 @@ msgstr "Ingen arkivfilen i huvud" msgid " failed - " msgstr " misslyckades - " -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paket %s är redan installerat" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "felaktig db-fil %s\n" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "inga paket\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "NEJ " -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "JA" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1567,37 +1567,37 @@ msgstr "========= Kataloger ej uttryckligen inkluderade i paketet:\n" msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "katalog %s skapad med rättigheter %04o.\n" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "arkivfil %s fanns inte i huvudets fillista\n" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "%s sparades som %s\n" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir av %s misslyckades: Katalogen är inte tom\n" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir av %s misslyckades: %s\n" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink av %s misslyckades: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "%s skapades som %s\n" @@ -2830,18 +2830,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "hämtar lista över monterade filsystem\n" diff --git a/po/tr.po b/po/tr.po index 81d05b3d8..962701412 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -1446,89 +1446,89 @@ msgstr "" msgid " failed - " msgstr " baþarýsýz - " -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabaný açýlamadý\n" -#: lib/depends.c:294 +#: lib/depends.c:297 #, fuzzy, c-format msgid "package %s was already added, replacing with %s\n" msgstr "%s zaten kurulu" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:607 +#: lib/depends.c:610 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:628 +#: lib/depends.c:631 #, fuzzy msgid "(db files)" msgstr "db dosyasý %s hatalý\n" -#: lib/depends.c:640 +#: lib/depends.c:643 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:653 +#: lib/depends.c:656 #, fuzzy msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:692 +#: lib/depends.c:695 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "HAYIR " -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "EVET" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort baðýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1587,37 +1587,37 @@ msgstr "========= Pakette bulunmayan dizinler:\n" msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%s dizin %04o izinleriyle oluþturuldu.\n" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "%s %s olarak kaydedildi\n" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s / %s dizin silinemedi - Dizin boþ deðil\n" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s / %s dizinin silinmesi baþarýsýz: %s\n" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s / %s bað kaldýrýlamadý: %s\n" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "%s %s olarak oluþturuldu\n" @@ -2851,18 +2851,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasýndan dolayý %s atlandý\n" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "baðlý dosya sistemlerinin listesi alýnýyor\n" diff --git a/po/uk.po b/po/uk.po index 493b20d6a..ce77e1b8b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,83 +1410,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2777,18 +2777,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index 493b20d6a..ce77e1b8b 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,83 +1410,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2777,18 +2777,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index 493b20d6a..ce77e1b8b 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,83 +1410,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2777,18 +2777,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 493b20d6a..ce77e1b8b 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-17 15:43-0500\n" +"POT-Creation-Date: 2001-11-18 12:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,83 +1410,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:101 +#: lib/depends.c:104 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:294 +#: lib/depends.c:297 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:566 +#: lib/depends.c:569 msgid "(cached)" msgstr "" -#: lib/depends.c:591 +#: lib/depends.c:594 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:607 +#: lib/depends.c:610 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:628 +#: lib/depends.c:631 msgid "(db files)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:643 msgid "(db provides)" msgstr "" -#: lib/depends.c:653 +#: lib/depends.c:656 msgid "(db package)" msgstr "" -#: lib/depends.c:692 +#: lib/depends.c:695 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "NO " msgstr "" -#: lib/depends.c:694 lib/rpmds.c:407 lib/rpmds.c:566 +#: lib/depends.c:697 lib/rpmds.c:407 lib/rpmds.c:566 msgid "YES" msgstr "" -#: lib/depends.c:1031 +#: lib/depends.c:1034 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1293 +#: lib/depends.c:1302 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1387 +#: lib/depends.c:1396 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1471 +#: lib/depends.c:1479 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1541 +#: lib/depends.c:1549 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1576 +#: lib/depends.c:1584 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1581 +#: lib/depends.c:1589 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1171 +#: lib/fsm.c:1177 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1452 +#: lib/fsm.c:1458 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1573 lib/fsm.c:1701 +#: lib/fsm.c:1579 lib/fsm.c:1707 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1727 +#: lib/fsm.c:1733 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1733 +#: lib/fsm.c:1739 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1743 +#: lib/fsm.c:1749 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1762 +#: lib/fsm.c:1768 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2777,18 +2777,18 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:181 +#: lib/transaction.c:178 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:999 +#: lib/transaction.c:988 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1094 +#: lib/transaction.c:1083 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 9670b7088..ad4767df8 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -245,8 +245,8 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { &count); } - if (mdfile(s->fileList[fileNumber], buf)) { - strcpy(buf, "(unknown)"); + if (domd5(s->fileList[fileNumber], buf, 1)) { + strcpy(buf, "00000000000000000000000000000000"); } tuple = PyTuple_New(3); diff --git a/rpm.spec b/rpm.spec index 500221a52..91f128280 100644 --- a/rpm.spec +++ b/rpm.spec @@ -586,3 +586,4 @@ fi - use TR_REMOVED relations as well as TR_ADDED for ordering. - drop requirement that removed packages immediately follow added. - hybrid chainsaw/presentation ordering algorithm. +- convert file md5sum's to binary on the fly, reducing memory footprint. diff --git a/rpm.spec.in b/rpm.spec.in index c15441582..842c6790c 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -586,3 +586,4 @@ fi - use TR_REMOVED relations as well as TR_ADDED for ordering. - drop requirement that removed packages immediately follow added. - hybrid chainsaw/presentation ordering algorithm. +- convert file md5sum's to binary on the fly, reducing memory footprint.