From: jbj Date: Wed, 5 Jul 2000 20:39:15 +0000 (+0000) Subject: - change optflags for i386. X-Git-Tag: rpm-4.4-release~2038 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a463744b6d4e6e5c0f05730cc77039f4a2e17fd7;p=platform%2Fupstream%2Frpm.git - change optflags for i386. - multilib patch, take 1. CVS patchset: 3920 CVS date: 2000/07/05 20:39:15 --- diff --git a/CHANGES b/CHANGES index a023a9c..d7fb36a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -3.0.4 -> 4.0 +3.0.5 -> 4.0 - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. - configure.in fiddles for BSD systems (Patrick Schoo). - API: change dbi to pass by reference, not value. @@ -67,6 +67,8 @@ - API: uncouple fadio from rest of rpmio. - API: externalize legacy fdOpen interface for rpmfind et al. - put version on rpmpopt filename to avoid legacy filename collision. + - change optflags for i386. + - multilib patch, take 1. 3.0.4 -> 3.0.5 - handle version 4 packaging as input. @@ -88,7 +90,6 @@ - support for separate source/binary compression policy. - support for bzip payloads. - 3.0.3 -> 3.0.4 - use compressed filenames on install side. - start unifying FD types, CFD_t now gone. diff --git a/build/files.c b/build/files.c index cd9d38c..5b1f02e 100644 --- a/build/files.c +++ b/build/files.c @@ -54,6 +54,8 @@ typedef struct { mode_t ar_dmode; } AttrRec; +static int multiLib = 0; /* MULTILIB */ + struct FileList { const char *buildRootURL; const char *prefix; @@ -596,6 +598,34 @@ static int parseForRegexLang(const char *fileName, /*@out@*/char **lang) return 0; } +static int parseForRegexMultiLib(const char *fileName) +{ + static int initialized = 0; + static int hasRegex = 0; + static regex_t compiledPatt; + + if (! initialized) { + const char *patt; + int rc = 0; + + initialized = 1; + patt = rpmExpand("%{_multilibpatt}", NULL); + if (!(patt && *patt != '%')) + rc = 1; + else if (regcomp(&compiledPatt, patt, REG_EXTENDED | REG_NOSUB)) + rc = -1; + xfree(patt); + if (rc) + return rc; + hasRegex = 1; + } + + if (! hasRegex || regexec(&compiledPatt, fileName, 0, NULL, 0)) + return 1; + + return 0; +} + /** */ VFA_t virtualFileAttributes[] = { { "%dir", 0 }, /* XXX why not RPMFILE_DIR? */ @@ -603,6 +633,7 @@ VFA_t virtualFileAttributes[] = { { "%ghost", RPMFILE_GHOST }, { "%readme", RPMFILE_README }, { "%license", RPMFILE_LICENSE }, + { "%multilib", 0 }, #if WHY_NOT { "%spec", RPMFILE_SPEC }, @@ -650,9 +681,12 @@ static int parseForSimple(/*@unused@*/Spec spec, Package pkg, char *buf, for (vfa = virtualFileAttributes; vfa->attribute != NULL; vfa++) { if (strcmp(s, vfa->attribute)) continue; - if (!strcmp(s, "%dir")) - fl->isDir = 1; /* XXX why not RPMFILE_DIR? */ - else + if (!vfa->flag) { + if (!strcmp(s, "%dir")) + fl->isDir = 1; /* XXX why not RPMFILE_DIR? */ + else if (!strcmp(s, "%multilib")) + fl->currentFlags |= multiLib; + } else fl->currentFlags |= vfa->flag; break; } @@ -756,6 +790,7 @@ static void genCpioListAndHeader(struct FileList *fl, struct cpioFileMapping *clp; char *s; char buf[BUFSIZ]; + uint_32 multiLibMask = 0; /* Sort the big list */ qsort(fl->fileList, fl->fileListRecsUsed, @@ -777,7 +812,12 @@ static void genCpioListAndHeader(struct FileList *fl, rpmError(RPMERR_BADSPEC, _("File listed twice: %s"), flp->fileURL); fl->processingFailed = 1; } - + + if (flp->flags & RPMFILE_MULTILIB_MASK) + multiLibMask |= + (1 << ((flp->flags & RPMFILE_MULTILIB_MASK)) + >> RPMFILE_MULTILIB_SHIFT); + /* Make the cpio list */ if (! (flp->flags & RPMFILE_GHOST)) { clp->fsPath = xstrdup(flp->diskURL); @@ -787,9 +827,12 @@ static void genCpioListAndHeader(struct FileList *fl, clp->finalGid = flp->fl_gid; clp->mapFlags = CPIO_MAP_PATH | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID; - if (isSrc) { + + if (isSrc) clp->mapFlags |= CPIO_FOLLOW_SYMLINKS; - } + if (flp->flags & RPMFILE_MULTILIB_MASK) + clp->mapFlags |= CPIO_MULTILIB; + clp++; (*cpioCount)++; } @@ -894,6 +937,13 @@ static void genCpioListAndHeader(struct FileList *fl, } headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE, &(fl->totalFileSize), 1); + /* XXX This should be added always so that packages look alike. + * XXX However, there is logic in files.c/depends.c that checks for + * XXX existence (rather than value) that will need to change as well. + */ + if (multiLibMask) + headerAddEntry(h, RPMTAG_MULTILIBS, RPM_INT32_TYPE, + &multiLibMask, 1); } static void freeFileList(FileListRec *fileList, int count) @@ -1059,6 +1109,11 @@ static int addFile(struct FileList *fl, const char * diskURL, struct stat *statp flp->flags = fl->currentFlags; flp->verifyFlags = fl->currentVerifyFlags; + if (multiLib + && !(flp->flags & RPMFILE_MULTILIB_MASK) + && !parseForRegexMultiLib(fileURL)) + flp->flags |= multiLib; + fl->totalFileSize += flp->fl_size; } @@ -1134,6 +1189,12 @@ static int processPackageFiles(Spec spec, Package pkg, char buf[BUFSIZ]; AttrRec specialDocAttrRec; char *specialDoc = NULL; + +#ifdef MULTILIB + multiLib = rpmExpandNumeric("%{_multilibno}"); + if (multiLib) + multiLib = RPMFILE_MULTILIB(multiLib); +#endif /* MULTILIB */ nullAttrRec(&specialDocAttrRec); pkg->cpioList = NULL; @@ -1173,7 +1234,7 @@ static int processPackageFiles(Spec spec, Package pkg, } /* Init the file list structure */ - + /* XXX spec->buildRootURL == NULL, then xstrdup("") is returned */ fl.buildRootURL = rpmGenPath(spec->rootURL, spec->buildRootURL, NULL); @@ -1686,7 +1747,8 @@ DepMsg_t depMsgs[] = { }; static int generateDepends(Spec spec, Package pkg, - struct cpioFileMapping *cpioList, int cpioCount) + struct cpioFileMapping *cpioList, int cpioCount, + int multiLib) { StringBuf writeBuf; int writeBytes; @@ -1703,11 +1765,16 @@ static int generateDepends(Spec spec, Package pkg, return 0; writeBuf = newStringBuf(); - writeBytes = 0; - while (cpioCount--) { + for (writeBytes = 0; cpioCount--; cpioList++) { + + if (multiLib == 2) { + if (!(cpioList->mapFlags & CPIO_MULTILIB)) + continue; + cpioList->mapFlags &= ~CPIO_MULTILIB; + } + writeBytes += strlen(cpioList->fsPath) + 1; appendLineStringBuf(writeBuf, cpioList->fsPath); - cpioList++; } for (dm = depMsgs; dm->msg != NULL; dm++) { @@ -1772,7 +1839,8 @@ static int generateDepends(Spec spec, Package pkg, } /* Parse dependencies into header */ - rc = parseRCPOT(spec, pkg, getStringBuf(readBuf), tag, 0); + rc = parseRCPOT(spec, pkg, getStringBuf(readBuf), tag, 0, + multiLib > 1 ? RPMSENSE_MULTILIB : 0); freeStringBuf(readBuf); if (rc) { @@ -1802,6 +1870,9 @@ static void printDepMsg(DepMsg_t *dm, int count, const char **names, } rpmMessage(RPMMESS_NORMAL, " %s", *names); + if (hasFlags && isDependsMULTILIB(*flags)) + rpmMessage(RPMMESS_NORMAL, " (multilib)"); + if (hasVersions && !(*versions != NULL && **versions != '\0')) continue; if (!(hasFlags && (*flags && RPMSENSE_SENSEMASK))) @@ -1888,7 +1959,15 @@ int processBinaryFiles(Spec spec, int installSpecialDoc, int test) if ((rc = processPackageFiles(spec, pkg, installSpecialDoc, test))) res = rc; - generateDepends(spec, pkg, pkg->cpioList, pkg->cpioCount); + /* XXX This should be added always so that packages look alike. + * XXX However, there is logic in files.c/depends.c that checks for + * XXX existence (rather than value) that will need to change as well. + */ + if (headerGetEntry(pkg->header, RPMTAG_MULTILIBS, NULL, NULL, NULL)) { + generateDepends(spec, pkg, pkg->cpioList, pkg->cpioCount, 1); + generateDepends(spec, pkg, pkg->cpioList, pkg->cpioCount, 2); + } else + generateDepends(spec, pkg, pkg->cpioList, pkg->cpioCount, 0); printDeps(pkg->header); } diff --git a/build/parsePreamble.c b/build/parsePreamble.c index d72d5ba..aab3ab4 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -524,9 +524,8 @@ fprintf(stderr, "*** PPA BuildRoot %s already set, skipping field %s\n", buildRo case RPMTAG_REQUIREFLAGS: case RPMTAG_CONFLICTFLAGS: case RPMTAG_PREREQ: - if ((rc = parseRCPOT(spec, pkg, field, tag, 0))) { + if ((rc = parseRCPOT(spec, pkg, field, tag, 0, 0))) return rc; - } break; case RPMTAG_EXCLUDEARCH: case RPMTAG_EXCLUSIVEARCH: diff --git a/build/parseReqs.c b/build/parseReqs.c index 53e98db..99bb4d2 100644 --- a/build/parseReqs.c +++ b/build/parseReqs.c @@ -28,57 +28,58 @@ static struct ReqComp { #define SKIPNONWHITE(_x){while(*(_x) &&!(isspace(*_x) || *(_x) == ',')) (_x)++;} /** */ -int parseRCPOT(Spec spec, Package pkg, const char *field, int tag, int index) +int parseRCPOT(Spec spec, Package pkg, const char *field, int tag, + int index, int tagflags) { const char *r, *re, *v, *ve; char *req, *version; Header h; - int tagflags, flags; + int flags; switch (tag) { case RPMTAG_PROVIDEFLAGS: - tagflags = RPMSENSE_PROVIDES; + tagflags |= RPMSENSE_PROVIDES; h = pkg->header; break; case RPMTAG_OBSOLETES: - tagflags = RPMSENSE_OBSOLETES; + tagflags |= RPMSENSE_OBSOLETES; h = pkg->header; break; case RPMTAG_CONFLICTFLAGS: - tagflags = RPMSENSE_CONFLICTS; + tagflags |= RPMSENSE_CONFLICTS; h = pkg->header; break; case RPMTAG_BUILDCONFLICTS: - tagflags = RPMSENSE_CONFLICTS; + tagflags |= RPMSENSE_CONFLICTS; h = spec->buildRestrictions; break; case RPMTAG_PREREQ: - tagflags = RPMSENSE_PREREQ; + tagflags |= RPMSENSE_PREREQ; h = pkg->header; break; case RPMTAG_BUILDPREREQ: - tagflags = RPMSENSE_PREREQ; + tagflags |= RPMSENSE_PREREQ; h = spec->buildRestrictions; break; case RPMTAG_TRIGGERIN: - tagflags = RPMSENSE_TRIGGERIN; + tagflags |= RPMSENSE_TRIGGERIN; h = pkg->header; break; case RPMTAG_TRIGGERPOSTUN: - tagflags = RPMSENSE_TRIGGERPOSTUN; + tagflags |= RPMSENSE_TRIGGERPOSTUN; h = pkg->header; break; case RPMTAG_TRIGGERUN: - tagflags = RPMSENSE_TRIGGERUN; + tagflags |= RPMSENSE_TRIGGERUN; h = pkg->header; break; case RPMTAG_BUILDREQUIRES: - tagflags = RPMSENSE_ANY; + tagflags |= RPMSENSE_ANY; h = spec->buildRestrictions; break; default: case RPMTAG_REQUIREFLAGS: - tagflags = RPMSENSE_ANY; + tagflags |= RPMSENSE_ANY; h = pkg->header; break; } diff --git a/build/parseScript.c b/build/parseScript.c index c6883c6..721c40b 100644 --- a/build/parseScript.c +++ b/build/parseScript.c @@ -248,7 +248,7 @@ int parseScript(Spec spec, int parsePart) index = addTriggerIndex(pkg, file, p, prog); /* Generate the trigger tags */ - if ((rc = parseRCPOT(spec, pkg, reqargs, reqtag, index))) { + if ((rc = parseRCPOT(spec, pkg, reqargs, reqtag, index, 0))) { freeStringBuf(sb); FREE(progArgv); FREE(argv); diff --git a/build/reqprov.c b/build/reqprov.c index 989a2f3..529a400 100644 --- a/build/reqprov.c +++ b/build/reqprov.c @@ -47,10 +47,10 @@ int addReqProv(/*@unused@*/ Spec spec, Header h, flagtag = RPMTAG_REQUIREFLAGS; } - flag = (flag & RPMSENSE_SENSEMASK) | extra; - if (!version) { + flag = (flag & (RPMSENSE_SENSEMASK | RPMSENSE_MULTILIB)) | extra; + + if (!version) version = ""; - } /* Check for duplicate dependencies. */ if (headerGetEntry(h, nametag, NULL, (void **) &names, &len)) { @@ -71,13 +71,19 @@ int addReqProv(/*@unused@*/ Spec spec, Header h, if (strcmp(names[len], name)) continue; if (flagtag && versions != NULL && - (strcmp(versions[len], version) || flags[len] != flag)) + (strcmp(versions[len], version) || + ((flags[len] | RPMSENSE_MULTILIB) != (flag | RPMSENSE_MULTILIB)))) continue; if (indextag && indexes != NULL && indexes[len] != index) continue; /* This is a duplicate dependency. */ duplicate = 1; + + if (flagtag && isDependsMULTILIB(flag) && + !isDependsMULTILIB(flags[len])) + flags[len] |= RPMSENSE_MULTILIB; + break; } FREE(names); diff --git a/build/rpmbuild.h b/build/rpmbuild.h index b81e92d..f63f8df 100644 --- a/build/rpmbuild.h +++ b/build/rpmbuild.h @@ -72,13 +72,25 @@ extern "C" { /* from build/names.h */ +/** */ void freeNames(void); + +/** */ /*@observer@*/ const char *getUname(uid_t uid); + +/** */ /*@observer@*/ const char *getUnameS(const char *uname); + +/** */ /*@observer@*/ const char *getGname(gid_t gid); + +/** */ /*@observer@*/ const char *getGnameS(const char *gname); +/** */ /*@observer@*/ const char *const buildHost(void); + +/** */ /*@observer@*/ time_t *const getBuildTime(void); /* from build/read.h */ @@ -86,72 +98,121 @@ void freeNames(void); /* returns 0 - success */ /* 1 - EOF */ /* <0 - error */ +/** */ int readLine(Spec spec, int strip); +/** */ void closeSpec(Spec spec); + +/** */ void handleComments(char *s); /* from build/part.h */ +/** */ int isPart(char *line); /* from build/misc.h */ +/** */ int parseNum(const char *line, /*@out@*/int *res); /* from build/parse.h */ +/** */ void addChangelogEntry(Header h, time_t time, const char *name, const char *text); + +/** */ int parseChangelog(Spec spec); + +/** */ int parseDescription(Spec spec); + +/** */ int parseFiles(Spec spec); + +/** */ int parsePreamble(Spec spec, int initialPackage); + +/** */ int parsePrep(Spec spec); -int parseRCPOT(Spec spec, Package pkg, const char *field, int tag, int index); + +/** */ +int parseRCPOT(Spec spec, Package pkg, const char *field, int tag, int index, + int flags); + +/** */ int parseTrigger(Spec spec, Package pkg, char *field, int tag); + +/** */ int parseScript(Spec spec, int parsePart); + +/** */ int parseBuildInstallClean(Spec spec, int parsePart); /* from build/expression.h */ +/** */ int parseExpressionBoolean(Spec, char *); + +/** */ char *parseExpressionString(Spec, char *); /* from build/build.h */ +/** */ int doScript(Spec spec, int what, const char *name, StringBuf sb, int test); /* from build/package.h */ +/** */ int lookupPackage(Spec spec, const char *name, int flag, /*@out@*/Package *pkg); + +/** */ /*@only@*/ Package newPackage(Spec spec); + +/** */ void freePackages(Spec spec); + +/** */ void freePackage(/*@only@*/ Package p); /* from build/reqprov.h */ +/** */ int addReqProv(/*@unused@*/Spec spec, Header h, int flag, const char *name, const char *version, int index); /* from build/files.h */ +/** */ int processBinaryFiles(Spec spec, int installSpecialDoc, int test); + +/** */ void initSourceHeader(Spec spec); + +/** */ int processSourceFiles(Spec spec); /* global entry points */ +/** */ int parseSpec(Spec *specp, const char *specFile, const char *rootdir, const char *buildRoot, int inBuildArch, const char *passPhrase, char *cookie, int anyarch, int force); +/** */ extern int (*parseSpecVec) (Spec *specp, const char *specFile, const char *rootdir, const char *buildRoot, int inBuildArch, const char *passPhrase, char *cookie, int anyarch, int force); /* XXX FIXME */ +/** */ int buildSpec(Spec spec, int what, int test); +/** */ int packageBinaries(Spec spec); + +/** */ int packageSources(Spec spec); #ifdef __cplusplus diff --git a/installplatform b/installplatform index ec993c2..ec02df4 100755 --- a/installplatform +++ b/installplatform @@ -54,10 +54,20 @@ for SUBST in $SUBSTS ; do RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e 's, ,\ ,g'`" ARCH_INSTALL_POST='%{nil}' + MULTILIBNO= case "${ARCH}-${OS}" in sparc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-sparc64-linux; LIB=lib64 ;; + sparc-linux) MULTILIBNO=1 ;; + sparcv9-linux) MULTILIBNO=1 ;; + sparc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-sparc64-linux; LIB=lib64; MULTILIBNO=2 ;; esac + if [ "$MULTILIBNO" ]; then + MULTILIBSED='-e /^@MULTILIB/d -e s,@MULTILIBNO@,'$MULTILIBNO, + else + MULTILIBSED='-e /^@MULTILIBSTART@/,/^@MULTILIBEND@/d' + fi + cat $PLATFORM | \ sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \ -e "s,@RPMRC_ARCH@,$base_arch," \ @@ -65,6 +75,7 @@ for SUBST in $SUBSTS ; do -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \ -e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \ -e 's,\${,%{_,' \ + $MULTILIBSED \ > ${PPD}/macros # diff --git a/lib/cpio.h b/lib/cpio.h index ef8ba4a..d88b474 100644 --- a/lib/cpio.h +++ b/lib/cpio.h @@ -51,6 +51,7 @@ #define CPIO_MAP_UID (1 << 2) #define CPIO_MAP_GID (1 << 3) #define CPIO_FOLLOW_SYMLINKS (1 << 4) /* only for building */ +#define CPIO_MULTILIB (1 << 31) /* internal, only for building */ /** * Defines a single file to be included in a cpio payload. diff --git a/lib/depends.c b/lib/depends.c index ba9ab8e..d079284 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -175,6 +175,9 @@ static /*@exposed@*/ struct availablePackage * alAddPackage(struct availableList int first, last, fileNum; int origNumDirs; int pkgNum; + uint_32 multiLibMask = 0; + uint_32 * fileFlags = NULL; + uint_32 * pp = NULL; if (al->size == al->alloced) { al->alloced += 5; @@ -184,9 +187,28 @@ static /*@exposed@*/ struct availablePackage * alAddPackage(struct availableList pkgNum = al->size++; p = al->list + pkgNum; p->h = headerLink(h); /* XXX reference held by transaction set */ + p->multiLib = 0; /* MULTILIB */ headerNVR(p->h, &p->name, &p->version, &p->release); + /* XXX This should be added always so that packages look alike. + * XXX However, there is logic in files.c/depends.c that checks for + * XXX existence (rather than value) that will need to change as well. + */ + if (headerGetEntry(p->h, RPMTAG_MULTILIBS, NULL, (void **) &pp, NULL)) + multiLibMask = *pp; + + if (multiLibMask) { + for (i = 0; i < pkgNum - 1; i++) { + if (!strcmp (p->name, al->list[i].name) + && headerGetEntry(al->list[i].h, RPMTAG_MULTILIBS, NULL, + (void **) &pp, NULL) + && !rpmVersionCompare(p->h, al->list[i].h) + && *pp && !(*pp & multiLibMask)) + p->multiLib = multiLibMask; + } + } + if (!headerGetEntry(h, RPMTAG_EPOCH, NULL, (void **) &p->epoch, NULL)) p->epoch = NULL; @@ -214,6 +236,7 @@ static /*@exposed@*/ struct availablePackage * alAddPackage(struct availableList &dirNames, &numDirs); headerGetEntryMinMemory(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL); + headerGetEntry(h, RPMTAG_FILEFLAGS, NULL, (void **) &fileFlags, NULL); /* XXX FIXME: We ought to relocate the directory list here */ @@ -260,6 +283,8 @@ static /*@exposed@*/ struct availablePackage * alAddPackage(struct availableList dirMatch->files[dirMatch->numFiles].baseName = p->baseNames[fileNum]; dirMatch->files[dirMatch->numFiles].pkgNum = pkgNum; + dirMatch->files[dirMatch->numFiles].fileFlags = + fileFlags[fileNum]; dirMatch->numFiles++; } @@ -332,6 +357,14 @@ static void alMakeIndex(struct availableList * al) #endif for (j = 0; j < al->list[i].providesCount; j++) { + + /* If multilib install, skip non-multilib provides. */ + if (al->list[i].multiLib && + !isDependsMULTILIB(al->list[i].provideFlags[j])) { + ai->size--; + continue; + } + ai->index[k].package = al->list + i; ai->index[k].entry = al->list[i].provides[j]; ai->index[k].entryLen = strlen(al->list[i].provides[j]); @@ -656,6 +689,18 @@ int rpmtransAddPackage(rpmTransactionSet rpmdep, Header h, FD_t fd, while((h2 = rpmdbNextIterator(mi)) != NULL) { if (rpmVersionCompare(h, h2)) removePackage(rpmdep, rpmdbGetIteratorOffset(mi), alNum); + else { + uint_32 *p, multiLibMask = 0, oldmultiLibMask = 0; + + if (headerGetEntry(h2, RPMTAG_MULTILIBS, NULL, (void **) &p, NULL)) + oldmultiLibMask = *p; + if (headerGetEntry(h, RPMTAG_MULTILIBS, NULL, (void **) &p, NULL)) + multiLibMask = *p; + if (oldmultiLibMask && multiLibMask + && !(oldmultiLibMask & multiLibMask)) { + rpmdep->addedPackages.list[alNum].multiLib = multiLibMask; + } + } } rpmdbFreeIterator(mi); } @@ -782,6 +827,13 @@ alFileSatisfiesDepend(struct availableList * al, /* XXX FIXME: these file lists should be sorted and bsearched */ for (i = 0; i < dirMatch->numFiles; i++) { if (!strcmp(dirMatch->files[i].baseName, baseName)) { + + /* If a file dependency would be satisfied by a file + we are not going to install, skip it. */ + if (al->list[dirMatch->files[i].pkgNum].multiLib && + !isFileMULTILIB(dirMatch->files[i].fileFlags)) + continue; + if (keyType) rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added files)\n"), keyType, fileName); @@ -1024,7 +1076,7 @@ exit: } static int checkPackageDeps(rpmTransactionSet rpmdep, struct problemsSet * psp, - Header h, const char * keyName) + Header h, const char * keyName, uint_32 multiLib) { const char * name, * version, * release; const char ** requires, ** requiresEVR = NULL; @@ -1055,6 +1107,11 @@ static int checkPackageDeps(rpmTransactionSet rpmdep, struct problemsSet * psp, if (keyName && strcmp(keyName, requires[i])) continue; + /* If this requirement comes from the core package only, not libraries, + then if we're installing the libraries only, don't count it in. */ + if (multiLib && !isDependsMULTILIB(requireFlags[i])) + continue; + keyDepend = printDepend("R", requires[i], requiresEVR[i], requireFlags[i]); rc = unsatisfiedDepend(rpmdep, " Requires", keyDepend, @@ -1118,6 +1175,11 @@ static int checkPackageDeps(rpmTransactionSet rpmdep, struct problemsSet * psp, if (keyName && strcmp(keyName, conflicts[i])) continue; + /* If this requirement comes from the core package only, not libraries, + then if we're installing the libraries only, don't count it in. */ + if (multiLib && !isDependsMULTILIB(conflictFlags[i])) + continue; + keyDepend = printDepend("C", conflicts[i], conflictsEVR[i], conflictFlags[i]); rc = unsatisfiedDepend(rpmdep, "Conflicts", keyDepend, @@ -1175,7 +1237,7 @@ static int checkPackageSet(rpmTransactionSet rpmdep, struct problemsSet * psp, rpmdbPruneIterator(mi, rpmdep->removedPackages, rpmdep->numRemovedPackages, 1); while ((h = rpmdbNextIterator(mi)) != NULL) { - if (checkPackageDeps(rpmdep, psp, h, key)) { + if (checkPackageDeps(rpmdep, psp, h, key, 0)) { rc = 1; break; } @@ -1431,7 +1493,7 @@ int rpmdepCheck(rpmTransactionSet rpmdep, p = rpmdep->addedPackages.list; for (i = 0; i < rpmdep->addedPackages.size; i++, p++) { - if (checkPackageDeps(rpmdep, &ps, p->h, NULL)) + if (checkPackageDeps(rpmdep, &ps, p->h, NULL, p->multiLib)) goto exit; /* Adding: check name against conflicts matches. */ diff --git a/lib/depends.h b/lib/depends.h index 778b0df..dc959e5 100644 --- a/lib/depends.h +++ b/lib/depends.h @@ -14,6 +14,7 @@ struct availablePackage { /*@dependent@*/ const char * release; /*@dependent@*/ int_32 * epoch; int providesCount, filesCount; + uint_32 multiLib; /* MULTILIB */ /*@dependent@*/ const void * key; rpmRelocation * relocs; /*@null@*/ FD_t fd; @@ -30,6 +31,7 @@ struct availableIndexEntry { struct fileIndexEntry { int pkgNum; + int fileFlags; /* MULTILIB */ /*@dependent@*/ const char * baseName; } ; diff --git a/lib/install.c b/lib/install.c index 6e5fbfb..2393e5f 100644 --- a/lib/install.c +++ b/lib/install.c @@ -236,6 +236,179 @@ static void trimChangelog(Header h) } /** */ +static int mergeFiles(Header h, Header newH, enum fileActions * actions) +{ + int i, j, k, fileCount; + int_32 type, count, dirNamesCount, dirCount; + void * data, * newdata; + int_32 * dirIndexes, * newDirIndexes; + uint_32 * fileSizes, fileSize; + char ** dirNames, ** newDirNames; + static int_32 mergeTags[] = { + RPMTAG_FILESIZES, + RPMTAG_FILESTATES, + RPMTAG_FILEMODES, + RPMTAG_FILERDEVS, + RPMTAG_FILEMTIMES, + RPMTAG_FILEMD5S, + RPMTAG_FILELINKTOS, + RPMTAG_FILEFLAGS, + RPMTAG_FILEUSERNAME, + RPMTAG_FILEGROUPNAME, + RPMTAG_FILEVERIFYFLAGS, + RPMTAG_FILEDEVICES, + RPMTAG_FILEINODES, + RPMTAG_FILELANGS, + RPMTAG_BASENAMES, + 0, + }; + static int_32 requireTags[] = { + RPMTAG_REQUIRENAME, RPMTAG_REQUIREVERSION, RPMTAG_REQUIREFLAGS, + RPMTAG_PROVIDENAME, RPMTAG_PROVIDEVERSION, RPMTAG_PROVIDEFLAGS, + RPMTAG_CONFLICTNAME, RPMTAG_CONFLICTVERSION, RPMTAG_CONFLICTFLAGS + }; + + headerGetEntry(h, RPMTAG_SIZE, NULL, (void **) &fileSizes, NULL); + fileSize = *fileSizes; + headerGetEntry(newH, RPMTAG_FILESIZES, NULL, (void **) &fileSizes, &count); + for (i = 0, fileCount = 0; i < count; i++) + if (actions[i] != FA_SKIPMULTILIB) { + fileCount++; + fileSize += fileSizes[i]; + } + headerModifyEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE, &fileSize, 1); + for (i = 0; mergeTags[i]; i++) + if (headerGetEntryMinMemory(newH, mergeTags[i], &type, + (void **) &data, &count)) { + switch (type) { + case RPM_CHAR_TYPE: + case RPM_INT8_TYPE: + newdata = xmalloc(fileCount * sizeof(int_8)); + for (j = 0, k = 0; j < count; j++) + if (actions[j] != FA_SKIPMULTILIB) + ((int_8 *) newdata)[k++] = ((int_8 *) data)[j]; + headerAddOrAppendEntry(h, mergeTags[i], type, newdata, + fileCount); + free (newdata); + break; + case RPM_INT16_TYPE: + newdata = xmalloc(fileCount * sizeof(int_16)); + for (j = 0, k = 0; j < count; j++) + if (actions[j] != FA_SKIPMULTILIB) + ((int_16 *) newdata)[k++] = ((int_16 *) data)[j]; + headerAddOrAppendEntry(h, mergeTags[i], type, newdata, + fileCount); + free (newdata); + break; + case RPM_INT32_TYPE: + newdata = xmalloc(fileCount * sizeof(int_32)); + for (j = 0, k = 0; j < count; j++) + if (actions[j] != FA_SKIPMULTILIB) + ((int_32 *) newdata)[k++] = ((int_32 *) data)[j]; + headerAddOrAppendEntry(h, mergeTags[i], type, newdata, + fileCount); + free (newdata); + break; + case RPM_STRING_ARRAY_TYPE: + newdata = xmalloc(fileCount * sizeof(char *)); + for (j = 0, k = 0; j < count; j++) + if (actions[j] != FA_SKIPMULTILIB) + ((char **) newdata)[k++] = ((char **) data)[j]; + headerAddOrAppendEntry(h, mergeTags[i], type, newdata, + fileCount); + free (newdata); + free (data); + break; + default: + fprintf(stderr, _("Data type %d not supported\n"), (int) type); + exit(EXIT_FAILURE); + /*@notreached@*/ + } + } + headerGetEntry(newH, RPMTAG_DIRINDEXES, NULL, (void **) &newDirIndexes, + &count); + headerGetEntryMinMemory(newH, RPMTAG_DIRNAMES, NULL, + (void **) &newDirNames, NULL); + headerGetEntry(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL); + headerGetEntryMinMemory(h, RPMTAG_DIRNAMES, NULL, (void **) &data, + &dirNamesCount); + + dirNames = xcalloc(dirNamesCount + fileCount, sizeof(char *)); + for (i = 0; i < dirNamesCount; i++) + dirNames[i] = ((char **) data)[i]; + dirCount = dirNamesCount; + newdata = xmalloc(fileCount * sizeof(int_32)); + for (i = 0, k = 0; i < count; i++) + if (actions[i] != FA_SKIPMULTILIB) { + for (j = 0; j < dirCount; j++) + if (!strcmp(dirNames[j], newDirNames[newDirIndexes[i]])) + break; + if (j == dirCount) + dirNames[dirCount++] = newDirNames[newDirIndexes[i]]; + ((int_32 *) newdata)[k++] = j; + } + headerAddOrAppendEntry(h, RPMTAG_DIRINDEXES, RPM_INT32_TYPE, newdata, + fileCount); + if (dirCount > dirNamesCount) + headerAddOrAppendEntry(h, RPMTAG_DIRNAMES, RPM_STRING_ARRAY_TYPE, + dirNames + dirNamesCount, + dirCount - dirNamesCount); + if (data) free (data); + if (newDirNames) free (newDirNames); + free (newdata); + free (dirNames); + + for (i = 0; i < 9; i += 3) { + char **Names, **EVR, **newNames, **newEVR; + uint_32 *Flags, *newFlags; + int Count = 0, newCount = 0; + + if (headerGetEntryMinMemory(newH, requireTags[i], NULL, + (void **) &newNames, &newCount)) { + headerGetEntryMinMemory(newH, requireTags[i+1], NULL, + (void **) &newEVR, NULL); + headerGetEntry(newH, requireTags[i+2], NULL, (void **) &newFlags, + NULL); + if (headerGetEntryMinMemory(h, requireTags[i], NULL, + (void **) &Names, &Count)) { + headerGetEntryMinMemory(h, requireTags[i+1], NULL, + (void **) &EVR, NULL); + headerGetEntry(h, requireTags[i+2], NULL, (void **) &Flags, + NULL); + for (j = 0; j < newCount; j++) + for (k = 0; k < Count; k++) + if (!strcmp (newNames[j], Names[k]) + && !strcmp (newEVR[j], EVR[k]) + && (newFlags[j] & RPMSENSE_SENSEMASK) == + (Flags[k] & RPMSENSE_SENSEMASK)) { + newNames[j] = NULL; + break; + } + } + for (j = 0, k = 0; j < newCount; j++) { + if (!newNames[j] || !isDependsMULTILIB(newFlags[j])) + continue; + if (j != k) { + newNames[k] = newNames[j]; + newEVR[k] = newEVR[j]; + newFlags[k] = newFlags[j]; + } + k++; + } + if (k) { + headerAddOrAppendEntry(h, requireTags[i], + RPM_STRING_ARRAY_TYPE, newNames, k); + headerAddOrAppendEntry(h, requireTags[i+1], + RPM_STRING_ARRAY_TYPE, newEVR, k); + headerAddOrAppendEntry(h, requireTags[i+2], RPM_INT32_TYPE, + newFlags, k); + } + } + } + return 0; +} + +/** */ static int markReplacedFiles(rpmdb db, const struct sharedFileInfo * replList) { const struct sharedFileInfo * fileInfo; @@ -643,6 +816,7 @@ const char *const fileActionString(enum fileActions a) case FA_REMOVE: return "remove"; case FA_SKIPNSTATE: return "skipnstate"; case FA_SKIPNETSHARED: return "skipnetshared"; + case FA_SKIPMULTILIB: return "skipmultilib"; } /*@notreached@*/ return "???"; @@ -707,13 +881,15 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h, struct fileInfo * files; char * fileStates = NULL; int i; + Header oldH = NULL; int otherOffset = 0; int scriptArg; int stripSize = 1; /* strip at least first / for cpio */ struct fileMemory *fileMem = NULL; char * currDir = NULL; - if (flags & RPMTRANS_FLAG_JUSTDB) + /* XXX this looks broke, as libraries may need /sbin/ldconfig for example */ + if (flags & (RPMTRANS_FLAG_JUSTDB | RPMTRANS_FLAG_MULTILIB)) flags |= RPMTRANS_FLAG_NOSCRIPTS; headerNVR(h, &name, &version, &release); @@ -731,8 +907,10 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h, mi = rpmdbInitIterator(db, RPMTAG_NAME, name, 0); rpmdbSetIteratorVersion(mi, version); rpmdbSetIteratorRelease(mi, release); - while (rpmdbNextIterator(mi)) { + while ((oldH = rpmdbNextIterator(mi))) { otherOffset = rpmdbGetIteratorOffset(mi); + oldH = (flags & RPMTRANS_FLAG_MULTILIB) + ? headerCopy(oldH) : NULL; break; } rpmdbFreeIterator(mi); @@ -819,6 +997,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h, break; case FA_SKIP: + case FA_SKIPMULTILIB: files[i].install = 0; break; @@ -910,6 +1089,21 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h, if (otherOffset) rpmdbRemove(db, otherOffset); + if (flags & RPMTRANS_FLAG_MULTILIB) { + uint_32 multiLib, * newMultiLib, * p; + + if (headerGetEntry(h, RPMTAG_MULTILIBS, NULL, (void **) &newMultiLib, + NULL) + && headerGetEntry(oldH, RPMTAG_MULTILIBS, NULL, + (void **) &p, NULL)) { + multiLib = *p; + multiLib |= *newMultiLib; + headerModifyEntry(oldH, RPMTAG_MULTILIBS, RPM_INT32_TYPE, + &multiLib, 1); + } + mergeFiles(oldH, h, actions); + } + if (rpmdbAdd(db, h)) { rc = 2; goto exit; @@ -952,5 +1146,7 @@ exit: freeFileMemory(fileMem); if (rc) headerFree(h); + if (oldH) + headerFree(oldH); return rc; } diff --git a/lib/install.h b/lib/install.h index 4a50596..ca2c7d2 100644 --- a/lib/install.h +++ b/lib/install.h @@ -17,7 +17,8 @@ struct sharedFileInfo { }; enum fileActions { FA_UNKNOWN = 0, FA_CREATE, FA_BACKUP, FA_SAVE, FA_SKIP, - FA_ALTNAME, FA_REMOVE, FA_SKIPNSTATE, FA_SKIPNETSHARED }; + FA_ALTNAME, FA_REMOVE, FA_SKIPNSTATE, FA_SKIPNETSHARED, + FA_SKIPMULTILIB }; enum fileTypes { XDIR, BDEV, CDEV, SOCK, PIPE, REG, LINK } ; #ifdef __cplusplus diff --git a/lib/rpmdb.c b/lib/rpmdb.c index ed805bb..7b72aa0 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -1741,7 +1741,7 @@ int rpmdbRemove(rpmdb rpmdb, unsigned int hdrNum) for (i = 0; i < rpmcnt; i++) { #if 0 - rpmMessage(RPMMESS_DEBUG, ("%6d %s\n"), i, rpmvals[i]); + rpmMessage(RPMMESS_DEBUG, ("%6d %s\n"), i, rpmvals[i]); #endif /* * This is almost right, but, if there are duplicate tag @@ -1962,7 +1962,7 @@ int rpmdbAdd(rpmdb rpmdb, Header h) for (i = 0; i < rpmcnt; i++) { #if 0 - rpmMessage(RPMMESS_DEBUG, _("%6d %s\n"), i, rpmvals[i]); + rpmMessage(RPMMESS_DEBUG, ("%6d %s\n"), i, rpmvals[i]); #endif /* diff --git a/lib/rpmlib.h b/lib/rpmlib.h index cc5220e..51483b0 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -189,8 +189,9 @@ extern const struct headerSprintfExtension rpmHeaderFormats[]; #define RPMTAG_PAYLOADFORMAT 1124 #define RPMTAG_PAYLOADCOMPRESSOR 1125 #define RPMTAG_PAYLOADFLAGS 1126 +#define RPMTAG_MULTILIBS 1127 -#define RPMTAG_FIRSTFREE_TAG 1127 /* internal */ +#define RPMTAG_FIRSTFREE_TAG 1128 /* internal */ #define RPMTAG_EXTERNAL_TAG 1000000 #define RPMFILE_STATE_NORMAL 0 @@ -208,21 +209,27 @@ extern const struct headerSprintfExtension rpmHeaderFormats[]; #define RPMFILE_GHOST (1 << 6) #define RPMFILE_LICENSE (1 << 7) #define RPMFILE_README (1 << 8) - -#define RPMVERIFY_NONE 0 -#define RPMVERIFY_MD5 (1 << 0) -#define RPMVERIFY_FILESIZE (1 << 1) -#define RPMVERIFY_LINKTO (1 << 2) -#define RPMVERIFY_USER (1 << 3) -#define RPMVERIFY_GROUP (1 << 4) -#define RPMVERIFY_MTIME (1 << 5) -#define RPMVERIFY_MODE (1 << 6) -#define RPMVERIFY_RDEV (1 << 7) -#define RPMVERIFY_READLINKFAIL (1 << 28) -#define RPMVERIFY_READFAIL (1 << 29) -#define RPMVERIFY_LSTATFAIL (1 << 30) - -#define RPMVERIFY_ALL ~(RPMVERIFY_NONE) +#define RPMFILE_MULTILIB_SHIFT 9 +#define RPMFILE_MULTILIB(N) ((N) << RPMFILE_MULTILIB_SHIFT) +#define RPMFILE_MULTILIB_MASK RPMFILE_MULTILIB(7) + +/* XXX Check file flags for multilib marker. */ +#define isFileMULTILIB(_fflags) ((_fflags) & RPMFILE_MULTILIB_MASK) + +#define RPMVERIFY_NONE 0 +#define RPMVERIFY_MD5 (1 << 0) +#define RPMVERIFY_FILESIZE (1 << 1) +#define RPMVERIFY_LINKTO (1 << 2) +#define RPMVERIFY_USER (1 << 3) +#define RPMVERIFY_GROUP (1 << 4) +#define RPMVERIFY_MTIME (1 << 5) +#define RPMVERIFY_MODE (1 << 6) +#define RPMVERIFY_RDEV (1 << 7) +#define RPMVERIFY_READLINKFAIL (1 << 28) +#define RPMVERIFY_READFAIL (1 << 29) +#define RPMVERIFY_LSTATFAIL (1 << 30) + +#define RPMVERIFY_ALL ~(RPMVERIFY_NONE) #define RPMSENSE_ANY 0 #define RPMSENSE_SERIAL (1 << 0) /* eliminated, backward compatibilty */ @@ -242,20 +249,24 @@ extern const struct headerSprintfExtension rpmHeaderFormats[]; #define RPMSENSE_TRIGGER (RPMSENSE_TRIGGERIN | RPMSENSE_TRIGGERUN | \ RPMSENSE_TRIGGERPOSTUN) +#define RPMSENSE_MULTILIB (1 << 19) + +#define isDependsMULTILIB(_dflags) ((_dflags) & RPMSENSE_MULTILIB) + /* Stuff for maintaining "variables" like SOURCEDIR, BUILDDIR, etc */ /* #define RPMVAR_SOURCEDIR 0 -- No longer used */ /* #define RPMVAR_BUILDDIR 1 -- No longer used */ -/* #define RPMVAR_DOCDIR 2 -- No longer used */ +/* #define RPMVAR_DOCDIR 2 -- No longer used */ #define RPMVAR_OPTFLAGS 3 /* #define RPMVAR_TOPDIR 4 -- No longer used */ /* #define RPMVAR_SPECDIR 5 -- No longer used */ /* #define RPMVAR_ROOT 6 -- No longer used */ /* #define RPMVAR_RPMDIR 7 -- No longer used */ /* #define RPMVAR_SRPMDIR 8 -- No longer used */ -/* #define RPMVAR_ARCHSENSITIVE 9 -- No longer used */ +/* #define RPMVAR_ARCHSENSITIVE 9 -- No longer used */ /* #define RPMVAR_REQUIREDISTRIBUTION 10 -- No longer used */ -/* #define RPMVAR_REQUIREGROUP 11 -- No longer used */ +/* #define RPMVAR_REQUIREGROUP 11 -- No longer used */ /* #define RPMVAR_REQUIREVENDOR 12 -- No longer used */ /* #define RPMVAR_DISTRIBUTION 13 -- No longer used */ /* #define RPMVAR_VENDOR 14 -- No longer used */ @@ -590,14 +601,15 @@ int rpmdepOrder(rpmTransactionSet order); void rpmdepFreeConflicts( /*@only@*/ struct rpmDependencyConflict * conflicts, int numConflicts); -#define RPMTRANS_FLAG_TEST (1 << 0) -#define RPMTRANS_FLAG_BUILD_PROBS (1 << 1) +#define RPMTRANS_FLAG_TEST (1 << 0) +#define RPMTRANS_FLAG_BUILD_PROBS (1 << 1) #define RPMTRANS_FLAG_NOSCRIPTS (1 << 2) #define RPMTRANS_FLAG_JUSTDB (1 << 3) #define RPMTRANS_FLAG_NOTRIGGERS (1 << 4) #define RPMTRANS_FLAG_NODOCS (1 << 5) #define RPMTRANS_FLAG_ALLFILES (1 << 6) #define RPMTRANS_FLAG_KEEPOBSOLETE (1 << 7) +#define RPMTRANS_FLAG_MULTILIB (1 << 8) typedef enum rpmProblemType_e { RPMPROB_BADARCH, RPMPROB_BADOS, @@ -641,14 +653,14 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify, /*@out@*/ rpmProblemSet * newProbs, int flags, int ignoreSet); -#define RPMPROB_FILTER_IGNOREOS (1 << 0) -#define RPMPROB_FILTER_IGNOREARCH (1 << 1) -#define RPMPROB_FILTER_REPLACEPKG (1 << 2) -#define RPMPROB_FILTER_FORCERELOCATE (1 << 3) -#define RPMPROB_FILTER_REPLACENEWFILES (1 << 4) -#define RPMPROB_FILTER_REPLACEOLDFILES (1 << 5) -#define RPMPROB_FILTER_OLDPACKAGE (1 << 6) -#define RPMPROB_FILTER_DISKSPACE (1 << 7) +#define RPMPROB_FILTER_IGNOREOS (1 << 0) +#define RPMPROB_FILTER_IGNOREARCH (1 << 1) +#define RPMPROB_FILTER_REPLACEPKG (1 << 2) +#define RPMPROB_FILTER_FORCERELOCATE (1 << 3) +#define RPMPROB_FILTER_REPLACENEWFILES (1 << 4) +#define RPMPROB_FILTER_REPLACEOLDFILES (1 << 5) +#define RPMPROB_FILTER_OLDPACKAGE (1 << 6) +#define RPMPROB_FILTER_DISKSPACE (1 << 7) /** rpmlead.c **/ @@ -810,11 +822,11 @@ typedef int (*QVF_t) (QVA_t *qva, rpmdb db, Header h); int showMatches(QVA_t *qva, /*@only@*/ /*@null@*/ rpmdbMatchIterator mi, QVF_t showPackage); -#define QUERY_FOR_LIST (1 << 1) -#define QUERY_FOR_STATE (1 << 2) -#define QUERY_FOR_DOCS (1 << 3) -#define QUERY_FOR_CONFIG (1 << 4) -#define QUERY_FOR_DUMPFILES (1 << 8) +#define QUERY_FOR_LIST (1 << 1) +#define QUERY_FOR_STATE (1 << 2) +#define QUERY_FOR_DOCS (1 << 3) +#define QUERY_FOR_CONFIG (1 << 4) +#define QUERY_FOR_DUMPFILES (1 << 8) /** * @param tag tag value @@ -860,10 +872,10 @@ int showQueryPackage(QVA_t *qva, rpmdb db, Header h); */ int rpmQuery(QVA_t *qva, enum rpmQVSources source, const char * arg); -#define VERIFY_FILES (1 << 9) -#define VERIFY_DEPS (1 << 10) -#define VERIFY_SCRIPT (1 << 11) -#define VERIFY_MD5 (1 << 12) +#define VERIFY_FILES (1 << 9) +#define VERIFY_DEPS (1 << 10) +#define VERIFY_SCRIPT (1 << 11) +#define VERIFY_MD5 (1 << 12) extern struct poptOption rpmVerifyPoptTable[]; @@ -884,16 +896,16 @@ int rpmVerify(QVA_t *qva, enum rpmQVSources source, const char *arg); /* ==================================================================== */ /* --- install/upgrade/erase modes */ -#define INSTALL_PERCENT (1 << 0) -#define INSTALL_HASH (1 << 1) -#define INSTALL_NODEPS (1 << 2) -#define INSTALL_NOORDER (1 << 3) -#define INSTALL_LABEL (1 << 4) /* set if we're being verbose */ -#define INSTALL_UPGRADE (1 << 5) -#define INSTALL_FRESHEN (1 << 6) +#define INSTALL_PERCENT (1 << 0) +#define INSTALL_HASH (1 << 1) +#define INSTALL_NODEPS (1 << 2) +#define INSTALL_NOORDER (1 << 3) +#define INSTALL_LABEL (1 << 4) /* set if we're being verbose */ +#define INSTALL_UPGRADE (1 << 5) +#define INSTALL_FRESHEN (1 << 6) -#define UNINSTALL_NODEPS (1 << 0) -#define UNINSTALL_ALLMATCHES (1 << 1) +#define UNINSTALL_NODEPS (1 << 0) +#define UNINSTALL_ALLMATCHES (1 << 1) /** @@ -914,9 +926,9 @@ int rpmErase(const char * rootdir, const char ** argv, int uninstallFlags, /* ==================================================================== */ /* --- checksig/resign */ -#define CHECKSIG_PGP (1 << 0) -#define CHECKSIG_MD5 (1 << 1) -#define CHECKSIG_GPG (1 << 2) +#define CHECKSIG_PGP (1 << 0) +#define CHECKSIG_MD5 (1 << 1) +#define CHECKSIG_GPG (1 << 2) /** */ @@ -926,8 +938,8 @@ int rpmCheckSig(int flags, const char **argv); */ int rpmReSign(int add, char *passPhrase, const char **argv); -#define ADD_SIGNATURE 1 -#define NEW_SIGNATURE 0 +#define ADD_SIGNATURE 1 +#define NEW_SIGNATURE 0 #ifdef __cplusplus } diff --git a/lib/transaction.c b/lib/transaction.c index 0a8c8fb..d8290ab 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -74,7 +74,7 @@ struct diskspaceInfo { #define XSTRCMP(a, b) ((!(a) && !(b)) || ((a) && (b) && !strcmp((a), (b)))) #define XFA_SKIPPING(_a) \ - ((_a) == FA_SKIP || (_a) == FA_SKIPNSTATE || (_a) == FA_SKIPNETSHARED) + ((_a) == FA_SKIP || (_a) == FA_SKIPNSTATE || (_a) == FA_SKIPNETSHARED || (_a) == FA_SKIPMULTILIB) static void freeFi(TFI_t *fi) { @@ -265,6 +265,7 @@ static Header relocateFileList(struct availablePackage * alp, int_32 * dirIndexes; int_32 * newDirIndexes; int_32 fileCount, dirCount; + uint_32 * fFlags = NULL; char * skipDirList; Header h; int relocated = 0, len; @@ -278,7 +279,7 @@ static Header relocateFileList(struct availablePackage * alp, (void **) &validRelocations, &numValid)) numValid = 0; - if (!rawRelocations && !numValid) { + if (!rawRelocations && !numValid && !alp->multiLib) { Header oH = headerLink(origH); return oH; } @@ -382,6 +383,8 @@ static Header relocateFileList(struct availablePackage * alp, headerGetEntry(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL); headerGetEntry(h, RPMTAG_DIRNAMES, NULL, (void **) &dirNames, &dirCount); + headerGetEntry(h, RPMTAG_FILEFLAGS, NULL, (void **) &fFlags, NULL); + skipDirList = xcalloc(sizeof(*skipDirList), dirCount); newDirIndexes = alloca(sizeof(*newDirIndexes) * fileCount); @@ -391,6 +394,16 @@ static Header relocateFileList(struct availablePackage * alp, /* Now relocate individual files. */ for (i = fileCount - 1; i >= 0; i--) { + + /* + * If only adding libraries of different arch into an already + * installed package, skip all other files. + */ + if (actions && alp->multiLib && !isFileMULTILIB((fFlags[i]))) { + actions[i] = FA_SKIPMULTILIB; + continue; + } + /* If we're skipping the directory this file is part of, skip this * file as well. */ @@ -788,6 +801,9 @@ static int handleInstInstalledFiles(TFI_t * fi, rpmdb db, if (otherStates[otherFileNum] != RPMFILE_STATE_NORMAL) continue; + if (fi->actions[fileNum] == FA_SKIPMULTILIB) + continue; + if (filecmp(otherModes[otherFileNum], otherMd5s[otherFileNum], otherLinks[otherFileNum], @@ -1293,14 +1309,15 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify, rpmdbFreeIterator(mi); } - if (!(ignoreSet & RPMPROB_FILTER_REPLACEPKG)) { + /* XXX why should multilib not display problems */ + if (!(ignoreSet & RPMPROB_FILTER_REPLACEPKG) && !alp->multiLib) { rpmdbMatchIterator mi; mi = rpmdbInitIterator(ts->db, RPMTAG_NAME, alp->name, 0); rpmdbSetIteratorVersion(mi, alp->version); rpmdbSetIteratorRelease(mi, alp->release); while (rpmdbNextIterator(mi) != NULL) { - psAppend(probs, RPMPROB_PKG_INSTALLED, alp->key, alp->h, NULL, - NULL, 0); + psAppend(probs, RPMPROB_PKG_INSTALLED, alp->key, alp->h, + NULL, NULL, 0); break; } rpmdbFreeIterator(mi); @@ -1477,7 +1494,8 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify, /* Extract file info for all files in this package from the database. */ matches = xcalloc(sizeof(*matches), fi->fc); - if (rpmdbFindFpList(ts->db, fi->fps, matches, fi->fc)) return 1; + if (rpmdbFindFpList(ts->db, fi->fps, matches, fi->fc)) + return 1; numShared = 0; for (i = 0; i < fi->fc; i++) @@ -1663,6 +1681,10 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify, } if (fd) { + + if (alp->multiLib) + transFlags |= RPMTRANS_FLAG_MULTILIB; + if (installBinaryPackage(ts->root, ts->db, fd, hdrs[i], transFlags, notify, notifyData, alp->key, fi->actions, diff --git a/lib/uninstall.c b/lib/uninstall.c index 9e10ebb..8b49ada 100644 --- a/lib/uninstall.c +++ b/lib/uninstall.c @@ -61,6 +61,7 @@ static int removeFile(const char * file, unsigned int flags, short mode, case FA_SKIP: case FA_SKIPNSTATE: case FA_SKIPNETSHARED: + case FA_SKIPMULTILIB: break; } diff --git a/platform.in b/platform.in index eb61bbf..04b3874 100644 --- a/platform.in +++ b/platform.in @@ -36,6 +36,7 @@ #------------------------------------------------------------------------ # Expanded at end of %install # + %__arch_install_post @ARCH_INSTALL_POST@ %__os_install_post \ @@ -58,3 +59,10 @@ %_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root %_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@ %_fixperms %{__chmod} -Rf @FIXPERMS@ + +@MULTILIBSTART@ +#------------------------------------------------------------------------ +# Multilibs +%_multilibno @MULTILIBNO@ +%_multilibpatt (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$ +@MULTILIBEND@ diff --git a/po/cs.po b/po/cs.po index ba9e80c..e62f34b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: 1998-10-10 10:10+0200\n" "Last-Translator: Pavel Makovec \n" "Language-Team: Czech \n" @@ -251,8 +251,8 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr " [--whatprovides] [--whatrequires] [--requires]" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +#, fuzzy +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--triggeredby] [--ftpuseport] [--ftpproxy " "]" @@ -1730,169 +1730,169 @@ msgstr "" msgid "syntax error in expression" msgstr "ve výrazu se oèekával ?" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, fuzzy, c-format msgid "Missing '(' in %s %s" msgstr "chybí %s\n" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, fuzzy, c-format msgid "Missing ')' in %s(%s" msgstr "chybí ':' u %s:%d" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, fuzzy, c-format msgid "Bad syntax: %s(%s)" msgstr "Nelze èíst %s: %s." -#: build/files.c:393 +#: build/files.c:395 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)" msgstr "Nelze èíst %s: %s." -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, fuzzy, c-format msgid "Two files on one line: %s" msgstr "nelze otevøít %s: %s" -#: build/files.c:679 +#: build/files.c:713 #, fuzzy, c-format msgid "File must begin with \"/\": %s" msgstr "pøemístìní musejí zaèínat znakem /" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, fuzzy, c-format msgid "File listed twice: %s" msgstr "Nelze èíst %s: %s." -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Nelze èíst %s: %s." -#: build/files.c:958 +#: build/files.c:1008 #, fuzzy, c-format msgid "File not found: %s" msgstr "Soubor nebyl na serveru nalezen" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "soubor %s: %s\n" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Soubor nebyl na serveru nalezen" -#: build/files.c:1160 +#: build/files.c:1221 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "chyba: nelze otevøít soubor %s\n" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, fuzzy, c-format msgid "Bad file: %s: %s" msgstr "soubor %s: %s\n" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Nelze spustit pgp" -#: build/files.c:1566 +#: build/files.c:1627 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Nelze naèíst cílpodpisu" -#: build/files.c:1648 +#: build/files.c:1709 #, fuzzy, c-format msgid "%s failed" msgstr "chyba pgp" -#: build/files.c:1652 +#: build/files.c:1713 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "%s nelze vytvoøit\n" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "%s nelze vytvoøit\n" -#: build/files.c:1886 +#: build/files.c:1957 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "soubor %s: %s\n" @@ -2166,32 +2166,32 @@ msgstr "p msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "neplatné èíslo balíèku: %s\n" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, fuzzy, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "chybí architektura pro %s u %s:%d" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, fuzzy, c-format msgid "Internal error: Bogus tag %d" msgstr "interní chyba (chyba rpm?): " -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Volby pro specifikaci balíèku:" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, fuzzy, c-format msgid "line %d: Unknown tag: %s" msgstr "Neznámý systém: %s\n" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2255,23 +2255,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, fuzzy, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "pøemístìní musejí zaèínat znakem /" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, fuzzy, c-format msgid "line %d: File name not permitted: %s" msgstr "balíèek %s není uveden v %s" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, fuzzy, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "balíèek %s není uveden v %s" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, fuzzy, c-format msgid "line %d: Version required: %s" msgstr "nelze otevøít %s: %s" @@ -2412,91 +2412,91 @@ msgid " failed - " msgstr "chyba pgp" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, fuzzy, c-format msgid "%s: %-45s YES (added package)\n" msgstr "¾ádný balíèek nevlastní soubor %s\n" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, fuzzy, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "¾ádný balíèek nevlastní soubor %s\n" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "¾ádný balíèek nevlastní soubor %s\n" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "polo¾ka 'vy¾aduje' balíèku %s není splnìna: %s\n" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "balíèek %s koliduje: %s\n" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "smyèka v øetìzu podmínek: %s" @@ -2673,7 +2673,7 @@ msgstr "soubor %s je na nezn msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "Poèet RPM_STRING_TYPE pro grabData() musí být 1.\n" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "Datový typ %d není podporován\n" @@ -2744,7 +2744,7 @@ msgstr "na konci v msgid "(unknown type)" msgstr "(neznámý typ)" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, fuzzy, c-format msgid " file: %s action: %s\n" msgstr "soubor %s: %s\n" @@ -2765,90 +2765,90 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 #, fuzzy msgid "installing a source package\n" msgstr "probíhá instalace binárních balíèkù\n" -#: lib/install.c:449 +#: lib/install.c:622 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "nelze otevøít soubor %s: " -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, fuzzy, c-format msgid "cannot write to %s" msgstr "nelze otevøít soubor %s: " -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "nelze otevøít soubor %s: " -#: lib/install.c:489 +#: lib/install.c:662 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "soubor %s: %s\n" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 #, fuzzy msgid "source package contains no .spec file" msgstr "balíèek %s neobsahuje soubory" -#: lib/install.c:573 +#: lib/install.c:746 #, fuzzy, c-format msgid "renaming %s to %s\n" msgstr "Probíhá získávání %s jako %s\n" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s nelze pøejmenovat na %s: %s" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "balíèek %s-%s-%s obsahuje sdílení soubory\n" -#: lib/install.c:779 +#: lib/install.c:957 #, fuzzy msgid "stopping install as we're running --test\n" msgstr "probíhá zastavení zdrojové instalace, nebo» jde jen o testování\n" -#: lib/install.c:784 +#: lib/install.c:962 #, fuzzy msgid "running preinstall script (if any)\n" msgstr "spou¹tí se pøípadný poinstalaèní skript\n" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "spou¹tí se pøípadný poinstalaèní skript\n" @@ -3437,7 +3437,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "chyba pøi hledání balíèku %s\n" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "nelze èíst hlavièku u %d pro vyhledání" @@ -3477,11 +3477,6 @@ msgstr "Prob msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" @@ -3883,27 +3878,27 @@ msgstr "V souboru rpmrc se mus msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "V souboru rpmrc se musí nastavit \"pgp_name:\"" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, fuzzy, c-format msgid "excluding file %s%s\n" msgstr "Probíhá naèítání %s\n" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytváøí se adresáø: %s\n" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, fuzzy, c-format msgid "relocating %s to %s\n" msgstr "Probíhá získávání %s jako %s\n" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "Probíhá získávání %s jako %s\n" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3923,16 +3918,16 @@ msgstr "ne msgid "removal of %s failed: %s" msgstr "%s nelze odstranit: %s" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "odstraní se soubory test = %d\n" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "spou¹tí se pøípadný poinstalaèní skript\n" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "skript nelze spustit" diff --git a/po/da.po b/po/da.po index 87a8240..e5c99cc 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" @@ -238,8 +238,8 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr " [--whatprovides] [--whatrequires] [--requires]" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +#, fuzzy +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--triggeredby] [--ftpuseport] [--ftpproxy ]" @@ -1578,168 +1578,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -2013,32 +2013,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2102,23 +2102,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2254,91 +2254,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2515,7 +2515,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2586,7 +2586,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2607,86 +2607,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3242,7 +3242,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3282,11 +3282,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "%6d %s\n" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3679,27 +3674,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3719,16 +3714,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" @@ -3948,3 +3943,6 @@ msgstr "" #, c-format msgid "failed to create %s: %s\n" msgstr "" + +#~ msgid "%6d %s\n" +#~ msgstr "%6d %s\n" diff --git a/po/de.po b/po/de.po index 709ae1c..dff4ab2 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.5.2\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -286,8 +286,7 @@ msgstr "" #: rpm.c:228 rpmqv.c:322 #, fuzzy -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--ftpuseport] [--ftpproxy ] [--ftpport ]" @@ -1795,179 +1794,179 @@ msgstr "" msgid "syntax error in expression" msgstr "? im Ausdruck erwartet" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, fuzzy, c-format msgid "Missing '(' in %s %s" msgstr "fehlende { nach %{" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, fuzzy, c-format msgid "Missing ')' in %s(%s" msgstr "fehlender ':' bei %s:%d" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" # , c-format -#: build/files.c:383 +#: build/files.c:385 #, fuzzy, c-format msgid "Bad syntax: %s(%s)" msgstr "Lesen von %s fehlgeschlagen: %s." # , c-format -#: build/files.c:393 +#: build/files.c:395 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" # , c-format #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, fuzzy, c-format msgid "Two files on one line: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:679 +#: build/files.c:713 #, fuzzy, c-format msgid "File must begin with \"/\": %s" msgstr "Verschiebungen müssen mit einem »/« beginnen" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" # , c-format -#: build/files.c:777 +#: build/files.c:812 #, fuzzy, c-format msgid "File listed twice: %s" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" # , c-format -#: build/files.c:948 +#: build/files.c:998 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:958 +#: build/files.c:1008 #, fuzzy, c-format msgid "File not found: %s" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" # , c-format -#: build/files.c:1015 +#: build/files.c:1065 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1160 +#: build/files.c:1221 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" # , c-format -#: build/files.c:1494 +#: build/files.c:1555 #, fuzzy, c-format msgid "Bad file: %s: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Konnte pgp nicht durchführen" -#: build/files.c:1566 +#: build/files.c:1627 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Konnte Signatur-Ziel (»sigtarget«) nicht lesen" -#: build/files.c:1648 +#: build/files.c:1709 #, fuzzy, c-format msgid "%s failed" msgstr "pgp fehlgeschlagen" # , c-format -#: build/files.c:1652 +#: build/files.c:1713 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "anlegen von %s fehlgeschlagen\n" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" # , c-format -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "anlegen von %s fehlgeschlagen\n" # , c-format -#: build/files.c:1886 +#: build/files.c:1957 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -2253,32 +2252,32 @@ msgstr "Verschiebungen m msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "ungültige Paket-Nummer: %s\n" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, fuzzy, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "fehlende Architektur für %s bei %s:%d" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Optionen der Paketauswahl:" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2344,24 +2343,24 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, fuzzy, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "Verschiebungen müssen mit einem »/« beginnen" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, fuzzy, c-format msgid "line %d: File name not permitted: %s" msgstr "Paket %s wird nicht in %s aufgeführt" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, fuzzy, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "Paket %s wird nicht in %s aufgeführt" # , c-format -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, fuzzy, c-format msgid "line %d: Version required: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -2505,91 +2504,91 @@ msgid " failed - " msgstr "pgp fehlgeschlagen" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, fuzzy, c-format msgid "%s: %-45s YES (added package)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, fuzzy, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2770,7 +2769,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2845,7 +2844,7 @@ msgid "(unknown type)" msgstr "(unbekannter Typ)" # , c-format -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, fuzzy, c-format msgid " file: %s action: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -2866,90 +2865,90 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 #, fuzzy msgid "installing a source package\n" msgstr "Paket installieren" -#: lib/install.c:449 +#: lib/install.c:622 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "kann Datei %s nicht öffnen: " -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, fuzzy, c-format msgid "cannot write to %s" msgstr "kann Datei %s nicht öffnen: " -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "kann Datei %s nicht öffnen: " # , c-format -#: lib/install.c:489 +#: lib/install.c:662 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 #, fuzzy msgid "source package contains no .spec file" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "umbennen von %s nach %s fehlgeschlagen: %s" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/install.c:721 +#: lib/install.c:897 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3546,7 +3545,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "Fehler beim Suchen nach Paket %s\n" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" @@ -3588,11 +3587,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" @@ -4008,27 +4002,27 @@ msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein" # , c-format -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, fuzzy, c-format msgid "excluding file %s%s\n" msgstr "Hole %s heraus\n" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -4048,16 +4042,16 @@ msgstr "Entfernen von %s fehlgeschlagen: %s" msgid "removal of %s failed: %s" msgstr "öffnen von %s fehlgeschlagen: %s" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "Ausführung des Skripts fehlgeschlagen" diff --git a/po/es.po b/po/es.po index 71a2cb5..32b2109 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -231,8 +231,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1561,168 +1560,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1996,32 +1995,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2085,23 +2084,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2237,91 +2236,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2498,7 +2497,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2569,7 +2568,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2590,86 +2589,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3225,7 +3224,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3265,11 +3264,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3662,27 +3656,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3702,16 +3696,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/fi.po b/po/fi.po index 1dc33d8..57105fc 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -257,8 +257,7 @@ msgstr "" #: rpm.c:228 rpmqv.c:322 #, fuzzy -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--ftpuseport] [--ftpproxy ] [--ftpport " "]" @@ -1766,169 +1765,169 @@ msgstr "" msgid "syntax error in expression" msgstr "odotin '?'-merkkiä ilmauksessa" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, fuzzy, c-format msgid "Missing '(' in %s %s" msgstr "puuttuva '{' '%':n jälkeen" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, fuzzy, c-format msgid "Missing ')' in %s(%s" msgstr "puuttuva ':', %s:%d" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, fuzzy, c-format msgid "Bad syntax: %s(%s)" msgstr "En voi lukea %s: %s." -#: build/files.c:393 +#: build/files.c:395 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)" msgstr "En voi lukea %s: %s." -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, fuzzy, c-format msgid "Two files on one line: %s" msgstr "en voinut avata %s: %s" -#: build/files.c:679 +#: build/files.c:713 #, fuzzy, c-format msgid "File must begin with \"/\": %s" msgstr "siirtojen pitää alkaa /-merkillä" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, fuzzy, c-format msgid "File listed twice: %s" msgstr "En voi lukea %s: %s." -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "En voi lukea %s: %s." -#: build/files.c:958 +#: build/files.c:1008 #, fuzzy, c-format msgid "File not found: %s" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1160 +#: build/files.c:1221 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, fuzzy, c-format msgid "Bad file: %s: %s" msgstr "en voinut avata %s: %s" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:1566 +#: build/files.c:1627 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:1648 +#: build/files.c:1709 #, fuzzy, c-format msgid "%s failed" msgstr "pgp epäonnistui" -#: build/files.c:1652 +#: build/files.c:1713 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:1886 +#: build/files.c:1957 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "en voinut avata %s: %s" @@ -2202,32 +2201,32 @@ msgstr "siirtojen pit msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "virheellinen paketin numero: %s\n" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, fuzzy, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "%s:n puuttuva arkkitehtuuri %s:%d" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Paketin määrittelyparametrit:" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2291,23 +2290,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, fuzzy, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "siirtojen pitää alkaa /-merkillä" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, fuzzy, c-format msgid "line %d: File name not permitted: %s" msgstr "paketti %s ei ole %s:ssä" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, fuzzy, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "paketti %s ei ole %s:ssä" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, fuzzy, c-format msgid "line %d: Version required: %s" msgstr "en voinut avata %s: %s" @@ -2448,91 +2447,91 @@ msgid " failed - " msgstr "pgp epäonnistui" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, fuzzy, c-format msgid "%s: %-45s YES (added package)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, fuzzy, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "paketti %s ei ole %s:ssä" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "silmukka edellytysten ketjussa: %s" @@ -2709,7 +2708,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2782,7 +2781,7 @@ msgstr "odotin '}'-merkki msgid "(unknown type)" msgstr "(tuntematon tyyppi)" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, fuzzy, c-format msgid " file: %s action: %s\n" msgstr "en voinut avata %s: %s" @@ -2803,88 +2802,88 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 #, fuzzy msgid "installing a source package\n" msgstr "asenna paketti" -#: lib/install.c:449 +#: lib/install.c:622 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "en voinut avata tiedostoa %s: " -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, fuzzy, c-format msgid "cannot write to %s" msgstr "en voinut avata tiedostoa %s: " -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "en voinut avata tiedostoa %s: " -#: lib/install.c:489 +#: lib/install.c:662 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "en voinut avata %s: %s" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 #, fuzzy msgid "source package contains no .spec file" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3473,7 +3472,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "virhe etsittäessä pakettia %s\n" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "en voi lukea headeria %d:stä päivittäessä" @@ -3513,11 +3512,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" @@ -3925,27 +3919,27 @@ msgstr "Sinun pit msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, fuzzy, c-format msgid "excluding file %s%s\n" msgstr "Haen: %s\n" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3965,16 +3959,16 @@ msgstr "%s:n rmdir ep msgid "removal of %s failed: %s" msgstr "%s:n poisto epäonnistui: %s" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "skriptin ajo epäonnistui" diff --git a/po/fr.po b/po/fr.po index baf5393..38827bb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2000-06-22 21:17-0400\n" +msgstr "POT-Creation-Date: 2000-07-05 16:33-0400\n" #: build.c:25 lib/rpminstall.c:253 lib/rpminstall.c:435 #, c-format @@ -229,9 +229,9 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" -msgstr "" +#, fuzzy +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" +msgstr " qui matchent " #: rpm.c:230 rpmqv.c:324 msgid "" @@ -1752,169 +1752,169 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, fuzzy, c-format msgid "Bad syntax: %s(%s)" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:393 +#: build/files.c:395 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, fuzzy, c-format msgid "Two files on one line: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:679 +#: build/files.c:713 #, fuzzy, c-format msgid "File must begin with \"/\": %s" msgstr "les arguments de --root (-r) doivent commencer par un /" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, fuzzy, c-format msgid "File not found: %s" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: build/files.c:1160 +#: build/files.c:1221 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, fuzzy, c-format msgid "Bad file: %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1566 +#: build/files.c:1627 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1648 +#: build/files.c:1709 #, fuzzy, c-format msgid "%s failed" msgstr "La construction a échoué.\n" -#: build/files.c:1652 +#: build/files.c:1713 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -2188,32 +2188,32 @@ msgstr "les arguments de --root (-r) doivent commencer par un /" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Options de spécification de package:" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2277,23 +2277,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, fuzzy, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "les arguments de --root (-r) doivent commencer par un /" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, fuzzy, c-format msgid "line %d: Version required: %s" msgstr "impossible d'ouvrir: %s\n" @@ -2432,91 +2432,91 @@ msgid " failed - " msgstr "La construction a échoué.\n" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "aucun package n'a été spécifié pour l'installation" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2693,7 +2693,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2766,7 +2766,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2787,88 +2787,88 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, fuzzy, c-format msgid "cannot write to %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 #, fuzzy msgid "source package contains no .spec file" msgstr "" " -f + - interroge le package à qui appartient " -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3459,7 +3459,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "aucun package n'a été spécifié pour la désinstallation" @@ -3499,11 +3499,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" @@ -3903,27 +3898,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3943,16 +3938,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" @@ -4319,11 +4314,6 @@ msgstr "impossible d'ouvrir: %s\n" #, fuzzy #~ msgid "" -#~ " [--ftpuseport] [--ftpproxy ] [--ftpport ]" -#~ msgstr " qui matchent " - -#, fuzzy -#~ msgid "" #~ " [--provides] [--dump] [--dbpath ] [targets]" #~ msgstr " -a - interroge l'ensemble des packages" diff --git a/po/gl.po b/po/gl.po index 71a2cb5..32b2109 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -231,8 +231,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1561,168 +1560,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1996,32 +1995,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2085,23 +2084,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2237,91 +2236,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2498,7 +2497,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2569,7 +2568,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2590,86 +2589,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3225,7 +3224,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3265,11 +3264,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3662,27 +3656,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3702,16 +3696,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/hu.po b/po/hu.po index 71a2cb5..32b2109 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -231,8 +231,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1561,168 +1560,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1996,32 +1995,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2085,23 +2084,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2237,91 +2236,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2498,7 +2497,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2569,7 +2568,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2590,86 +2589,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3225,7 +3224,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3265,11 +3264,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3662,27 +3656,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3702,16 +3696,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/id.po b/po/id.po index 71a2cb5..32b2109 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -231,8 +231,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1561,168 +1560,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1996,32 +1995,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2085,23 +2084,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2237,91 +2236,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2498,7 +2497,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2569,7 +2568,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2590,86 +2589,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3225,7 +3224,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3265,11 +3264,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3662,27 +3656,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3702,16 +3696,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/is.po b/po/is.po index 882d02b..1f2d17e 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 1.0\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: 2000-06-16 02:20+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -226,8 +226,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1556,168 +1555,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1991,32 +1990,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2080,23 +2079,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2232,91 +2231,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2493,7 +2492,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2564,7 +2563,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2585,86 +2584,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3220,7 +3219,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3260,11 +3259,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3657,27 +3651,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3697,16 +3691,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/it.po b/po/it.po index 71a2cb5..32b2109 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -231,8 +231,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1561,168 +1560,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1996,32 +1995,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2085,23 +2084,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2237,91 +2236,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2498,7 +2497,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2569,7 +2568,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2590,86 +2589,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3225,7 +3224,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3265,11 +3264,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3662,27 +3656,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3702,16 +3696,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/ja.po b/po/ja.po index 9fc6197..4498770 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm-3.0.4\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -127,7 +127,7 @@ msgstr "copyright # build root [BuildRoot] # net share [¥Í¥Ã¥È¶¦Í­] # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë] -# $Id: ja.po,v 1.82 2000/06/23 01:44:36 jbj Exp $ +# $Id: ja.po,v 1.83 2000/07/05 20:39:16 jbj Exp $ #: rpm.c:178 rpmqv.c:257 #, c-format msgid "rpm: %s\n" @@ -257,8 +257,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1694,170 +1693,170 @@ msgstr "&& msgid "syntax error in expression" msgstr "¼°Ãæ¤Çʸˡ¥¨¥é¡¼" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK ¼ºÇÔ: %s\n" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, fuzzy, c-format msgid "Missing '(' in %s %s" msgstr "%s %s ¤Ç '('¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, fuzzy, c-format msgid "Missing ')' in %s(%s" msgstr "')' ¤¬¤¢¤ê¤Þ¤»¤ó %s(%s " -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "̵¸ú¤Ê %s ¤Î¥È¡¼¥¯¥ó: %s" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "%s() ¤Ë³¤¯¶õÇò¤¬¤¢¤ê¤Þ¤»¤ó: %s" -#: build/files.c:383 +#: build/files.c:385 #, fuzzy, c-format msgid "Bad syntax: %s(%s)" msgstr "ÉÔÀµ¤Êʸˡ: %s(%s)" -#: build/files.c:393 +#: build/files.c:395 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)" msgstr "ÉÔÀµ¤Ê¥â¡¼¥É¥¹¥Ú¥Ã¥¯: %s(%s)" -#: build/files.c:405 +#: build/files.c:407 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "ÉÔÀµ¤Ê¥Ç¥£¥ì¥¯¥È¥ê¥â¡¼¥É¥¹¥Ú¥Ã¥¯: %s(%s)" -#: build/files.c:529 +#: build/files.c:531 #, fuzzy msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "°Û¾ï¤Ê¥í¥«¡¼¥ëĹ: \"%.*s\" %%lang(%s)" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "Ê£¿ô¤Î¥í¥«¡¼¥ë %.*s %%lang(%s)" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "%%docdir ¤Î¸Â³¦¤Ë㤷¤Þ¤·¤¿" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "%%docdir ¤Î°ú¿ô¤Ï1¤Ä¤Î¤ß¤Ç¤¹" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "1¹Ô¤Ë2¤Ä¤Î¥Õ¥¡¥¤¥ë: %s" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "¥Õ¥¡¥¤¥ë¤Ï \"/\" ¤«¤é»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "¾¤Î¥Õ¥©¡¼¥à¤ÇÆÃÊÌ¤Ê %%doc ¤òº®¤¼¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó: %s" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "¥Õ¥¡¥¤¥ë¤¬2²óɽµ­¤µ¤ì¤Æ¤¤¤Þ¤¹: %s" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "¥Õ¥¡¥¤¥ë¤Ï prefix (%s) ¤È°ìÃפ·¤Þ¤»¤ó: %s" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "ÉÔÀµ¤Ê½êÍ­¼Ô/¥°¥ë¡¼¥×: %s\n" -#: build/files.c:1015 +#: build/files.c:1065 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "¥Õ¥¡¥¤¥ë %4d: %07o %s.%s\t %s\n" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "¥Õ¥¡¥¤¥ë¤ÏÀèƬ¤Ë \"/\" ¤¬É¬ÍפǤ¹: %s" -#: build/files.c:1113 +#: build/files.c:1168 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó(by glob): %s" -#: build/files.c:1160 +#: build/files.c:1221 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "¹ÔÌÜ: %s" -#: build/files.c:1494 +#: build/files.c:1555 #, fuzzy, c-format msgid "Bad file: %s: %s" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "ÉÔÀµ¤Ê½êÍ­¼Ô/¥°¥ë¡¼¥×: %s" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/files.c:1566 +#: build/files.c:1627 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "%s ¤ò fork ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "%s ¼ºÇÔ" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "Á´¤Æ¤Î¥Ç¡¼¥¿¤ò %s ¤Ë½ñ¤¯¤³¤È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: build/files.c:1742 +#: build/files.c:1809 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "%s ¤òõ¤·¤Æ¤¤¤Þ¤¹: (%s ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹)...\n" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "%s ¤ò¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿:" -#: build/files.c:1886 +#: build/files.c:1957 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½èÍýÃæ: %s-%s-%s\n" @@ -2131,32 +2130,32 @@ msgstr "%d msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "%d ¹ÔÌÜ: Epoch/Serial ¥Õ¥£¡¼¥ë¥É¤ÏÈÖ¹æ¤Ç¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó: %s" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê BuildArchitecture ¥Õ¥©¡¼¥Þ¥Ã¥È: %s" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "ÆâÉô¥¨¥é¡¼: ¤Ë¤»¤Î¥¿¥° %d" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "ÉÔÀµ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤Î»ØÄê: %s" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹: %s" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "%d ¹ÔÌÜ: ÉÔÌÀ¤Ê¥¿¥°: %s" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ï BuildRoot ¤ò»ÈÍѤǤ­¤Þ¤»¤ó" @@ -2220,24 +2219,24 @@ msgstr "%d msgid "line %d: second %%prep" msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤΠ%%prep" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, fuzzy, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" "%d ¹ÔÌÜ: °Í¸À­¥È¡¼¥¯¥ó¤Ï±Ñ¿ô»ú¡¢'_'¡¢'/' ¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, fuzzy, c-format msgid "line %d: File name not permitted: %s" msgstr "%d ¹ÔÌÜ: ¥Õ¥¡¥¤¥ë̾¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, fuzzy, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "%d ¹ÔÌÜ: ¥Ð¡¼¥¸¥ç¥óÉÕ¤±¤µ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, fuzzy, c-format msgid "line %d: Version required: %s" msgstr "%d ¹ÔÌÜ: ¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹: %s" @@ -2378,7 +2377,7 @@ msgid " failed - " msgstr "¼ºÇÔ - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2387,84 +2386,84 @@ msgstr "" "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, fuzzy, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:835 +#: lib/depends.c:887 #, fuzzy, c-format msgid "%s: %-45s YES (added package)\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, fuzzy, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, fuzzy, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "%s: %s ¤Ï rpmlib ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "prerequisite ¥Á¥§¡¼¥ó¤Î¥ë¡¼¥×: %s" @@ -2646,7 +2645,7 @@ msgstr " msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -2717,7 +2716,7 @@ msgstr " msgid "(unknown type)" msgstr "(ÉÔÌÀ¤Ê¥¿¥¤¥×)" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, fuzzy, c-format msgid " file: %s action: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: ¥¢¥¯¥·¥ç¥ó: %s\n" @@ -2741,87 +2740,87 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/install.c:385 +#: lib/install.c:558 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/install.c:449 +#: lib/install.c:622 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "%s ¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "¥½¡¼¥¹¤Ï: %s\n" -#: lib/install.c:479 +#: lib/install.c:652 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "spec ¥Õ¥¡¥¤¥ë¤Ï: %s\n" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ: %s" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "--test ¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤òÃæ»ß¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "¥×¥ê¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤¹" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Þ¤¹" -#: lib/install.c:918 +#: lib/install.c:1112 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" @@ -3417,7 +3416,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó" @@ -3457,11 +3456,6 @@ msgstr "%s msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" @@ -3869,27 +3863,27 @@ msgstr " msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, fuzzy, c-format msgid "excluding file %s%s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" @@ -3909,16 +3903,16 @@ msgstr "%s msgid "removal of %s failed: %s" msgstr "%s ¤Îºï½ü¤Ë¼ºÇÔ: %s" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "¥Õ¥¡¥¤¥ë test = %d ¤òºï½ü¤·¤Þ¤¹\n" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "¥Ý¥¹¥È¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" diff --git a/po/ko.po b/po/ko.po index 71a2cb5..32b2109 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -231,8 +231,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1561,168 +1560,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1996,32 +1995,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2085,23 +2084,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2237,91 +2236,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2498,7 +2497,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2569,7 +2568,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2590,86 +2589,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3225,7 +3224,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3265,11 +3264,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3662,27 +3656,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3702,16 +3696,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/no.po b/po/no.po index 6b1b4da..e8a42c3 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: 2000-06-22 21:59+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -242,8 +242,8 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr " [--whatprovides] [--whatrequires] [--requires]" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +#, fuzzy +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--triggeredby] [--ftpuseport] [--ftpproxy ]" @@ -1583,168 +1583,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -2018,32 +2018,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2107,23 +2107,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2259,91 +2259,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2520,7 +2520,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2591,7 +2591,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2612,86 +2612,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3247,7 +3247,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3287,11 +3287,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3684,27 +3679,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3724,16 +3719,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/pl.po b/po/pl.po index 6a4ae7d..3760546 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm-3.0.2\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -253,8 +253,8 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr " [--whatprovides] [--whatrequires] [--requires]" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +#, fuzzy +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--triggeredby] [--ftpuseport] [--ftpproxy ]" @@ -1707,169 +1707,169 @@ msgstr "&& i || nie jest wspierane dla msgid "syntax error in expression" msgstr "b³±d sk³adni w wyra¿eniu" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK nie powiod³o siê: %s\n" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "Brak '(' w %s %s" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "Brak ')' w %s(%s" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "B³êdny znak %s: %s" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "Brak bia³ego znaku po %s(): %s" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "B³êdna sk³adnia: %s(%s)" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "B³êdne okre¶lenie trybu: %s(%s)" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "B³êdne okre¶lenie dirmode: %s(%s)" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "Niespotykana d³ugo¶æ okre¶lenia lokalizacji \"%.*s\" w %%lang(%s)" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "Powtórzone okre¶lenie lokalizacji %.*s w %%lang(%s)" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "Limit trafieñ dla %%docdir" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "Tylko jeden argument dla %%docdir" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "Dwa pliki w jedenj linii: %s" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "Plik musi siê zaczynaæ od \"/\": %s" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "Nie mo¿na mieszaæ specjalnej %%doc z innymi formami: %s" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "Plik podany dwukrotnie: %s" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Plik nie zgadza siê z prefiksem (%s): %s" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "B³êdny u¿ytkownik/grupa: %s\n" -#: build/files.c:1015 +#: build/files.c:1065 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Plik %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "Plik musi siê zaczynaæ od \"/\": %s" -#: build/files.c:1113 +#: build/files.c:1168 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1160 +#: build/files.c:1221 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "Nie mo¿na otworzyæ %%files pliku: %s" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "linia: %s" -#: build/files.c:1494 +#: build/files.c:1555 #, fuzzy, c-format msgid "Bad file: %s: %s" msgstr "plik %s: %s\n" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "B³êdny u¿ytkownik/grupa: %s" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Nie mo¿na uruchomiæ %s" -#: build/files.c:1566 +#: build/files.c:1627 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Nie mo¿na wykonaæ fork na %s" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "%s nie powiod³o siê" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "zapisanie wszystkich danych do %s nie powiod³o siê" -#: build/files.c:1742 +#: build/files.c:1809 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "Wyszukiwanie wymaganych zasobów...\n" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "Wyszukiwanie nie powiod³o siê" -#: build/files.c:1886 +#: build/files.c:1957 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Przetwarzanie plików: %s\n" @@ -2143,32 +2143,32 @@ msgstr "linia %d: wpis Docdir musi si msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "linia %d: pole Epoch/Serial musi byæ liczb±: %s" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "linia %d: B³êdny format wpisu BuildArchitecture: %s" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "B³±d wewnêtrzny: Fa³szywa etykieta %d" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "B³êdna specyfikacja pakietu: $s" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "Pakiet ju¿ istnieje: %s" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "linia %d: Nieznana etykieta: %s" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "W pliku spec nie mo¿na u¿ywaæ wpisów BuildRoot" @@ -2232,24 +2232,24 @@ msgstr "linia %d: B msgid "line %d: second %%prep" msgstr "linia %d: druga sekcja %%prep" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" "linia %d: Znaki musz± sie zaczynaæ od alfanumerycznych, '_' lub '/': %s" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "linia %d: Nazwa pliku niedozwolona: %s" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "linia %d: Wersja w nazwach plików niedozwolona: %s" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "linia %d: Wymagana wersja: %s" @@ -2385,91 +2385,91 @@ msgid " failed - " msgstr " nie powiod³o siê -" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, fuzzy, c-format msgid "%s: %-45s YES (added package)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, fuzzy, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakiet %s jest w konflikcie: %s\n" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2646,7 +2646,7 @@ msgstr "plik %s jest na nieznanym urz msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obs³ugiwany\n" @@ -2717,7 +2717,7 @@ msgstr "spodziewany | na ko msgid "(unknown type)" msgstr "(nieznany typ)" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr " plik: %s akcja: %s\n" @@ -2738,86 +2738,86 @@ msgstr "warto #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr " na pliku " -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "instacja pakietu ¼ród³owego\n" -#: lib/install.c:449 +#: lib/install.c:622 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "nie mo¿na utworzyæ %s" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "nie mo¿na zapisaæ do %s" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "¼ród³a w: %s\n" -#: lib/install.c:479 +#: lib/install.c:652 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "nie mo¿na utworzyæ %s" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "plik spec w: %s\n" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "zmiana nazwy %s na %s\n" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "zmiana nazwy z %s na %s nie powiod³a sie: %s" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "pakiet: %s-%s-%s test plików = %d\n" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "przebieg testowy - instalacja zatrzymana\n" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "uruchamianie skryptu preinstall (je¶li istnieje)\n" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "ostrze¿enie: %s utworzony jako %s" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "ostrze¿enie: %s zapisany jako %s" -#: lib/install.c:918 +#: lib/install.c:1112 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" @@ -3395,7 +3395,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "b³±d szukania pakietu %s\n" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania" @@ -3435,11 +3435,6 @@ msgstr "zmiana nazwy %s na %s\n" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" @@ -3835,27 +3830,27 @@ msgstr "Musisz ustawi msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "Musisz ustawiæ \"%%_pgp_name\" w pliku swego makra" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, fuzzy, c-format msgid "excluding file %s%s\n" msgstr "wy³±czanie %s\n" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" @@ -3875,16 +3870,16 @@ msgstr "skasowanie katalogu %s nie powiod msgid "removal of %s failed: %s" msgstr "skasowanie %s nie powiod³o siê: %s" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "usunie pliki test = %d\n" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "uruchamianie skryptu postinstalacyjnego (je¦li istnieje)\n" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "wykonanie skryptu nie powiod³o siê" diff --git a/po/pt.po b/po/pt.po index 71a2cb5..32b2109 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -231,8 +231,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1561,168 +1560,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1996,32 +1995,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2085,23 +2084,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2237,91 +2236,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2498,7 +2497,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2569,7 +2568,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2590,86 +2589,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3225,7 +3224,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3265,11 +3264,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3662,27 +3656,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3702,16 +3696,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index ba9feda..689af5f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # Revised by Arnaldo Carvalho de Melo , 1998. # msgid "" -msgstr "POT-Creation-Date: 2000-06-22 21:17-0400\n" +msgstr "POT-Creation-Date: 2000-07-05 16:33-0400\n" #: build.c:25 lib/rpminstall.c:253 lib/rpminstall.c:435 #, c-format @@ -260,8 +260,7 @@ msgstr "" #: rpm.c:228 rpmqv.c:322 #, fuzzy -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--ftpuseport] [--ftpproxy ] [--ftpport " "]" @@ -1797,180 +1796,180 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" # , c-format -#: build/files.c:383 +#: build/files.c:385 #, fuzzy, c-format msgid "Bad syntax: %s(%s)" msgstr "Não consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:393 +#: build/files.c:395 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" # , c-format #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, fuzzy, c-format msgid "Two files on one line: %s" msgstr "Não consegui abrir: %s\n" -#: build/files.c:679 +#: build/files.c:713 #, fuzzy, c-format msgid "File must begin with \"/\": %s" msgstr "argumentos para o --dbpath devem começar com uma /" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" # , c-format -#: build/files.c:777 +#: build/files.c:812 #, fuzzy, c-format msgid "File listed twice: %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" # , c-format -#: build/files.c:948 +#: build/files.c:998 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/files.c:958 +#: build/files.c:1008 #, fuzzy, c-format msgid "File not found: %s" msgstr "não foi passado pacote para desinstalação" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "não foi passado pacote para desinstalação" # , c-format -#: build/files.c:1160 +#: build/files.c:1221 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "Não consegui abrir: %s\n" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" # , c-format -#: build/files.c:1494 +#: build/files.c:1555 #, fuzzy, c-format msgid "Bad file: %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" # , c-format #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:1566 +#: build/files.c:1627 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/files.c:1648 +#: build/files.c:1709 #, fuzzy, c-format msgid "%s failed" msgstr "Construção falhou.\n" # , c-format -#: build/files.c:1652 +#: build/files.c:1713 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "Não consegui abrir o pipe tar: %s\n" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" # , c-format -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "Não consegui abrir o pipe tar: %s\n" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -2257,32 +2256,32 @@ msgstr "argumentos para o --dbpath devem come msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Opcões para especificação de pacotes:" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2348,24 +2347,24 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, fuzzy, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "argumentos para o --dbpath devem começar com uma /" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" # , c-format -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, fuzzy, c-format msgid "line %d: Version required: %s" msgstr "Não consegui abrir: %s\n" @@ -2508,91 +2507,91 @@ msgid " failed - " msgstr "Construção falhou.\n" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "não foi passado pacote para instalação" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "não foi passado pacote para desinstalação" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2773,7 +2772,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2846,7 +2845,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2867,91 +2866,91 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 #, fuzzy msgid "installing a source package\n" msgstr "instale pacote" # , c-format -#: lib/install.c:449 +#: lib/install.c:622 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "Não consegui abrir: %s\n" # , c-format -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, fuzzy, c-format msgid "cannot write to %s" msgstr "Não consegui abrir: %s\n" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" # , c-format -#: lib/install.c:479 +#: lib/install.c:652 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "Não consegui abrir: %s\n" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 #, fuzzy msgid "source package contains no .spec file" msgstr "pesquise o pacote ao qual pertence" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "não foi passado pacote para instalação" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3546,7 +3545,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "não foi passado pacote para instalação" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "não foi passado pacote para desinstalação" @@ -3587,11 +3586,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" @@ -4027,7 +4021,7 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, fuzzy, c-format msgid "excluding file %s%s\n" msgstr "RPM versão %s\n" @@ -4040,23 +4034,23 @@ msgstr "RPM vers # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM versão %s\n" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" # , c-format -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "Não consegui abrir: %s\n" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -4076,16 +4070,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/ro.po b/po/ro.po index 3584ce8..8b743aa 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -226,8 +226,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1556,168 +1555,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1991,32 +1990,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2080,23 +2079,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2232,91 +2231,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2493,7 +2492,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2564,7 +2563,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2585,86 +2584,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3220,7 +3219,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3260,11 +3259,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3657,27 +3651,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3697,16 +3691,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 71a2cb5..32b2109 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -231,8 +231,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1561,168 +1560,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1996,32 +1995,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2085,23 +2084,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2237,91 +2236,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2498,7 +2497,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2569,7 +2568,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2590,86 +2589,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3225,7 +3224,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3265,11 +3264,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3662,27 +3656,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3702,16 +3696,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/po/ru.po b/po/ru.po index 08af830..aab2245 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" @@ -244,8 +244,8 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr " [--whatprovides] [--whatrequires] [--requires]" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +#, fuzzy +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--triggeredby] [--ftpuseport] [--ftpproxy ]" @@ -1711,169 +1711,169 @@ msgstr "&& msgid "syntax error in expression" msgstr "ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ × ×ÙÒÁÖÅÎÉÉ" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "ïÛÉÂËÁ TIMECHECK: %s\n" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, fuzzy, c-format msgid "Missing '(' in %s %s" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ '(' × %s" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, fuzzy, c-format msgid "Missing ')' in %s(%s" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ')' × %s" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "îÅ×ÅÒÎÙÊ ÔÏËÅÎ %s: %s" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, fuzzy, c-format msgid "Bad syntax: %s(%s)" msgstr "îÅ×ÅÒÎÙÊ ÓÉÎÔÁËÓÉÓ %s(): %s" -#: build/files.c:393 +#: build/files.c:395 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)" msgstr "îÅ×ÅÒÎÙÅ ÐÒÁ×Á %s(): %s" -#: build/files.c:405 +#: build/files.c:407 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "îÅ×ÅÒÎÙÅ ÐÒÁ×Á ÎÁ ËÁÔÁÌÏÇ %s(): %s" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "îÅÏÂÙÞÎÁÑ ÄÌÉÎÁ locale: \"%.*s\" × %%lang(%s)" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "äÕÂÌÉËÁÔ locale %.*s × %%lang(%s)" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "ìÉÍÉÔ ÄÌÑ %%docdir ÐÒÅ×ÚÏÊÄÅÎ" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "ôÏÌØËÏ ÏÄÉÎ ÁÒÇÕÍÅÎÔ ÄÌÑ %%docdir" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "ä×Á ÆÁÊÌÁ ÎÁ ÏÄÎÏÊ ÓÔÒÏËÅ: %s" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó \"/\": %s" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "îÅÌØÚÑ ÓÍÅÛÉ×ÁÔØ ÓÐÅÃ. %%doc Ó ÄÒÕÇÉÍÉ ÆÏÒÍÁÍÉ: %s" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "æÁÊÌ ÕËÁÚÁÎ Ä×ÁÖÄÙ: %s" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "æÁÊÌ ÎÅ ÏÔ×ÅÞÁÅÔ ÐÒÅÆÉËÓÕ (%s): %s" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "îÅ×ÅÒÎÁÑ ÐÁÒÁ ÈÏÚÑÉÎ/ÇÒÕÐÐÁ: %s\n" -#: build/files.c:1015 +#: build/files.c:1065 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "æÁÊÌ %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó \"/\": %s" -#: build/files.c:1113 +#: build/files.c:1168 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s" -#: build/files.c:1160 +#: build/files.c:1221 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ %%files: %s" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "ÓÔÒÏËÁ: %s" -#: build/files.c:1494 +#: build/files.c:1555 #, fuzzy, c-format msgid "Bad file: %s: %s" msgstr "ÆÁÊÌ %s: %s\n" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "îÅ×ÅÒÎÁÑ ÐÁÒÁ ÈÏÚÑÉÎ/ÇÒÕÐÐÁ: %s" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "îÅ ÍÏÇÕ ÉÓÐÏÌÎÉÔØ %s" -#: build/files.c:1566 +#: build/files.c:1627 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "îÅ ÍÏÇÕ ÆÏÒËÎÕÔØ %s" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "%s ÎÅ ÕÄÁÌÏÓØ" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "ÚÁÐÉÓØ ×ÓÅÈ ÄÁÎÎÙÈ × %s ÎÅ ÕÄÁÌÁÓØ" -#: build/files.c:1742 +#: build/files.c:1809 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "ïÐÒÅÄÅÌÑÀ ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ...\n" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "ïÛÉÂËÁ ÏÐÒÅÄÅÌÅÎÉÑ ÓÅÒ×ÉÓÏ×, ÐÒÅÄÏÓÔÁ×ÌÑÅÍÙÈ ÐÁËÅÔÏÍ" -#: build/files.c:1886 +#: build/files.c:1957 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "ïÂÒÁÂÁÔÙ×ÁÀ ÆÁÊÌÙ: %s\n" @@ -2147,32 +2147,32 @@ msgstr " msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "ÓÔÒÏËÁ %d: ðÏÌÅ Epoch/Serial ÄÏÌÖÎÏ ÂÙÔØ ÞÉÓÌÏÍ: %s" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ BuildArchitecture: %s" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: \"ìÅ×ÙÊ\" ÔÜÇ %d" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "îÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ÐÁËÅÔÁ: %s" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "ðÁËÅÔ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ: %s" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "ÓÔÒÏËÁ %d: îÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ: %s" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "æÁÊÌ spec ÎÅ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ BuildRoot" @@ -2236,23 +2236,23 @@ msgstr " msgid "line %d: second %%prep" msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÊ %%prep" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, fuzzy, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "ÓÔÒÏËÁ %d: %s: ÔÏËÅÎÙ ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó ÂÕË×Ù ÉÌÉ ÃÉÆÒÙ: %s" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, fuzzy, c-format msgid "line %d: File name not permitted: %s" msgstr "ÓÔÒÏËÁ %d: éÍÅÎÁ ÆÁÊÌÏ× × Obsoletes ÎÅÄÏÐÕÓÔÉÍÙ: %s" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, fuzzy, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "ÓÔÒÏËÁ %d: ÷ÅÒÓÉÉ É ÉÍÅÎÁ ÆÁÊÌÏ× × %s ÎÅÄÏÐÕÓÔÉÍÙ: %s" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, fuzzy, c-format msgid "line %d: Version required: %s" msgstr "ÓÔÒÏËÁ %d: ÷ %s ÔÒÅÂÕÅÔÓÑ ×ÅÒÓÉÑ: %s" @@ -2388,91 +2388,91 @@ msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, fuzzy, c-format msgid "%s: %-45s YES (added package)\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, fuzzy, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅÐÏÞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s" @@ -2649,7 +2649,7 @@ msgstr " msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE count must be 1.\n" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" @@ -2720,7 +2720,7 @@ msgstr " msgid "(unknown type)" msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ)" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "ÆÁÊÌ : %s ÄÅÊÓÔ×ÉÅ: %s\n" @@ -2741,86 +2741,86 @@ msgstr " #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÉÓÈÏÄÎÙÊ ÐÁËÅÔ\n" -#: lib/install.c:449 +#: lib/install.c:622 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "ÎÅ ÍÏÇÕ ÐÉÓÁÔØ × %s" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "ÉÓÈÏÄÎÉËÉ ×: %s\n" -#: lib/install.c:479 +#: lib/install.c:652 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "ÆÁÊÌ spec ×: %s\n" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ .spec" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "ÐÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "ÏÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ %s × %s: %s" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "ÏÖÉÄÁÌÓÑ ÉÓÈÏÄÎÙÊ ÐÁËÅÔ, ÎÁÊÄÅÎ ÂÉÎÁÒÎÙÊ" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "ÐÁËÅÔ: %s-%s-%s ÆÁÊÌÏ×; test = %d\n" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "ÏÓÔÁÎÁ×ÌÉ×ÁÀ ÕÓÔÁÎÏ×ËÕ, Ô.Ë. ÍÙ ÉÓÐÏÌÎÑÅÍ --test\n" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "ÉÓÐÏÌÎÑÀ ÓËÒÉÐÔ preinstall (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÓÏÚÄÁÎ ËÁË %s" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÓÏÈÒÁÎÅÎ ËÁË %s" -#: lib/install.c:918 +#: lib/install.c:1112 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "ÉÓÐÏÌÎÑÀ ÓËÒÉÐÔ postinstall (ÅÓÌÉ ÅÓÔØ)\n" @@ -3395,7 +3395,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "ÏÛÉÂËÁ ÐÒÉ ÐÏÉÓËÅ ÐÁËÅÔÁ %s\n" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ÐÏÉÓËÁ" @@ -3435,11 +3435,6 @@ msgstr " msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" @@ -3838,27 +3833,27 @@ msgstr " msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name:\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, fuzzy, c-format msgid "excluding file %s%s\n" msgstr "ÉÓËÌÀÞÁÀ %s\n" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÀ %s × %s\n" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÀ %s × %s\n" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" @@ -3878,16 +3873,16 @@ msgstr " msgid "removal of %s failed: %s" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ %s: %s" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "ÕÄÁÌÉÔ ÆÁÊÌÙ; test = %d\n" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "ÉÓÐÏÌÎÑÀ ÓËÒÉÐÔ postuninstall (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "ÏÛÉÂËÁ ÉÓÐÏÌÎÅÎÉÑ ÓËÒÉÐÔÁ" diff --git a/po/sk.po b/po/sk.po index 0611ec6..86609eb 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.93\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -249,8 +249,8 @@ msgstr "" " [--whatprovides] [--whatrequires] [--requires]" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +#, fuzzy +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--triggeredby] [--ftpuseport] [--ftpproxy " "]" @@ -1714,170 +1714,170 @@ msgstr "&& a || nie s msgid "syntax error in expression" msgstr "chyba syntaxe vo výraze" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "chyba PREKROÈENIA ÈASU: %s\n" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, fuzzy, c-format msgid "Missing '(' in %s %s" msgstr "chýbajúce %s\n" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, fuzzy, c-format msgid "Missing ')' in %s(%s" msgstr "chýbajúca ':' na %s:%d" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "Chybný %s prvok: %s" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, fuzzy, c-format msgid "Bad syntax: %s(%s)" msgstr "Chybná %s() syntax: %s" -#: build/files.c:393 +#: build/files.c:395 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)" msgstr "Chybná ¹pecifikácia práv %s(): %s" -#: build/files.c:405 +#: build/files.c:407 #, fuzzy, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "Chybná ¹pecifikácia práv adresára %s(): %s" -#: build/files.c:529 +#: build/files.c:531 #, fuzzy msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "Iba jeden záznam v %%lang(): %s" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "Dosiahnutý limit pre %%docdir" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "Iba jeden argument pre %%docdir" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "Dva súbory na riadku: %s" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "Súbory musia zaèína» znakom \"/\": %s" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "Nie je mo¾né mie¹a» ¹peciálne %%doc s inými formami: %s" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "Súbor zadaný dvakrát: %s." -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Súbor nesúhlasí s prefixom (%s): %s." -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "Chybný vlastník/skupina: %s\n" -#: build/files.c:1015 +#: build/files.c:1065 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Súbor %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "Súbor potrebuje na zaèiatku \"/\": %s" -#: build/files.c:1113 +#: build/files.c:1168 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1160 +#: build/files.c:1221 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "riadok: %s" -#: build/files.c:1494 +#: build/files.c:1555 #, fuzzy, c-format msgid "Bad file: %s: %s" msgstr "súbor %s: %s\n" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "Chybný vlastník/skupina: %s" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Nie je mo¾né spusti» %s" -#: build/files.c:1566 +#: build/files.c:1627 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Nie je mo¾né vytvori» proces %s" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "%s zlyhalo" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "nepodarilo sa zapísa» v¹etky dáta do %s" -#: build/files.c:1742 +#: build/files.c:1809 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "Zis»ujú sa po¾adované vlastnosti...\n" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "Nepodarilo sa zisti» poskytované vlastnosti" -#: build/files.c:1886 +#: build/files.c:1957 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Spracovávajú sa súbory: %s\n" @@ -2151,32 +2151,32 @@ msgstr "riadok %d: Docdir mus msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "riadok %d: Epoch/Serial pole musí by» èíslo: %s" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "riadok %d: Chybný formát BuildArchitecture: %s" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "Interná chyba: Èudný popis %d " -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "Chybná ¹pecifikácia balíka: %s" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "Balík u¾ existuje: %s" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "riadok %d: Neznámy popis: %s" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "Spec súbor nemô¾e pou¾i» BuildRoot" @@ -2240,23 +2240,23 @@ msgstr "riadok %d: Chybn msgid "line %d: second %%prep" msgstr "riadok %d: druhý %%prep" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, fuzzy, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "riadok %d: %s: prvky musia zaèína» alfanumerickým znakom: %s" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, fuzzy, c-format msgid "line %d: File name not permitted: %s" msgstr "riadok %d: Obsoletes: neobsahuje ¾iadne názvy súborov: %s" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, fuzzy, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "riadok %d: Názvy súborov v %s neobsahujú verzie: %s" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, fuzzy, c-format msgid "line %d: Version required: %s" msgstr "riadok %d: V %s sú vy¾adované verzie: %s" @@ -2392,91 +2392,91 @@ msgid " failed - " msgstr " zlyhalo - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, fuzzy, c-format msgid "%s: %-45s YES (added package)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, fuzzy, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "balík %s koliduje: %s\n" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "sluèka v re»azi po¾iadaviek: %s" @@ -2653,7 +2653,7 @@ msgstr "s msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovaný\n" @@ -2724,7 +2724,7 @@ msgstr "| o msgid "(unknown type)" msgstr "(neznámy typ)" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr " súbor: akcia %s: %s\n" @@ -2745,86 +2745,86 @@ msgstr "hodnota %%instchangelog v makro-s #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr " pre súbor " -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "in¹taluje sa zdrojový balík\n" -#: lib/install.c:449 +#: lib/install.c:622 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "zdroje v: %s\n" -#: lib/install.c:479 +#: lib/install.c:652 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "spec-súbor v: %s\n" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "premenováva sa %s na %s\n" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "premenovanie %s na %s zlyhalo: %s" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "oèakávaný zdrojový balík, nájdený binárny" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "balík: %s-%s-%s test súborov = %d\n" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "in¹talácia zastavená kvôli re¾imu --test\n" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "vykonávajú sa predin¹talaèné skripty (ak existujú)\n" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "varovanie: %s vytvorené ako %s" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "varovanie: %s uchovaný ako %s" -#: lib/install.c:918 +#: lib/install.c:1112 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" @@ -3402,7 +3402,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "chyba pri hµadaní balíka %s\n" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie" @@ -3442,11 +3442,6 @@ msgstr "premenov msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" @@ -3842,27 +3837,27 @@ msgstr "Mus msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, fuzzy, c-format msgid "excluding file %s%s\n" msgstr "vynecháva sa %s\n" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" @@ -3882,16 +3877,16 @@ msgstr "rmdir %s zlyhalo: %s" msgid "removal of %s failed: %s" msgstr "odstránenie %s zlyhalo: %s" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "budú sa odstraòova» súbory test = %d\n" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "vykonávajú sa postdein¹talaèné skripty (ak existujú)\n" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "vykonanie skriptu zlyhalo" diff --git a/po/sl.po b/po/sl.po index 1364eb9..42d4eee 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.67 2000/06/23 01:44:36 jbj Exp $ +# $Id: sl.po,v 1.68 2000/07/05 20:39:18 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 3.0.4\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: 2000-02-17 22:25+01:00\n" "Last-Translator: Primo¾ Peterlin \n" "Language-Team: Slovenian \n" @@ -248,8 +248,8 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr " [--whatprovides] [--whatrequires] [--requires]" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +#, fuzzy +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--triggeredby] [--ftpuseport] [--ftpproxy ]" @@ -1697,168 +1697,168 @@ msgstr "&& in || nista podprta na nizih" msgid "syntax error in expression" msgstr "napaka v sklanji v izrazu" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK neuspe¹en: %s\n" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "Manjkajoèi ,(` v %s %s" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "Manjkajoèi ,)` v %s(%s" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "Neveljaven ¾eton %s: %s" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "Neprazen znak sledi %s(): %s" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "Okvarjena skladnja: %s(%s)" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "Okvarjeno doloèilo naèina: %s(%s)" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "Okvarjeno doloèilo naèina imenika: %s(%s)" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "Nenavadna dol¾ina za locale: \"%.s\" pri %%lang(%s)" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "Podvojeni locale %.*s za %%lang(%s)" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "Dosegli smo omejitev za %%docdir" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "Samo en argument za %%docdir je podan" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "Dve datoteki v eni vrstici: %s" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "Ime datoteke se mora zaèeti z \"/\": %s" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "Posebnih %%doc ni mo¾no me¹ati z ostalimi oblikami: %s" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "Datoteka je navedena dvakrat: %s" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "Simbolna povezava ka¾e na BuildRoot: %s -> %s" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Datoteka se ne ujema s predpono (%s): %s" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "Datoteke ni najti: %s" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "Okvarjen lastnik/skupina: %s\n" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Datoteka: %4d: %07o %s.%s\t %s\n" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "Datoteki manjka uvodni \"/\": %s" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "Datoteke ni mo¾no najti z raz¹iritvijo metaznakov v imenu: %s" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "Datoteke %s iz %%files ni mo¾no odpreti: %s" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "vrstica: %s" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "Okvarjena datoteka: %s: %s" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "Okvarjen lastnik/skupina: %s" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "Ni mo¾no izvesti %s: %s" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "Vejitev %s ni mo¾na: %s" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "%s neuspe¹en" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "pisanje podatkov na %s neuspe¹no" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "I¹èemo %s: (z uporabo %s)...\n" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "Neuspe¹no iskanje %s:" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Obdelujemo datoteke: %s-%s-%s\n" @@ -2132,32 +2132,32 @@ msgstr "vrstica %d: Docdir se mora za msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "vrstica %d: polje Epoch/Serial mora biti ¹tevilo: %s" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "vrstica %d: okvarjena oblika BuildArchitecture: %s" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "Interna napaka: Neprava znaèka %d" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "Okvarjeno doloèilo paketa: %s" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "Paket ¾e obstaja: %s" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "vrstica %d: Neznana znaèka: %s" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "Datoteka spec ne more uporabiti BuildRoot" @@ -2221,7 +2221,7 @@ msgstr "vrstica %d: Okvarjen argument za %%patch: %s" msgid "line %d: second %%prep" msgstr "vrstica %d: drugi %%prep" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" @@ -2229,17 +2229,17 @@ msgstr "" "vrstica %d: Oznaka odvisnosti se mora zaèeti z alfanum. znakom, ,_` ali ,/`: " "%s" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "vrstica %d: Ime datoteke ni dovoljeno: %s" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "vrstica %d: Ime datoteke z razlièico ni dovoljeno: %s" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "vrstica %d: Zahtevana razlièica: %s" @@ -2375,7 +2375,7 @@ msgid " failed - " msgstr " neuspe¹no - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2384,84 +2384,84 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:786 +#: lib/depends.c:838 #, fuzzy, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %s zadovoljen ob dodatnem seznamu datotek.\n" -#: lib/depends.c:835 +#: lib/depends.c:887 #, fuzzy, c-format msgid "%s: %-45s YES (added package)\n" msgstr "%s: %s zadovoljen ob dodatnem paketu.\n" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, fuzzy, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %s zadovoljen ob dodatni ponudbi.\n" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %s zadovoljen ob ponudbi db.\n" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, fuzzy, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "%s: %s zadovoljen ob paketih db.\n" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "%s: %s zadovoljen ob razlièici rpmlib.\n" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s zadovoljen ob dodatnem paketu.\n" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "paket %s zahteva, a ni zadovoljeno: %s\n" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s v sporu: %s\n" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "zanka v predpogojevani verigi: %s" @@ -2642,7 +2642,7 @@ msgstr "datoteka %s se nahaja na neznani napravi" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" @@ -2713,7 +2713,7 @@ msgstr "| pri msgid "(unknown type)" msgstr "(neznan tip)" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr " datoteka: %s akcija: %s\n" @@ -2734,86 +2734,86 @@ msgstr "vrednost %%instchangelog v makrodatoteki bi morala biti #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "razpakiranje arhiva neuspe¹no%s%s: %s" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr " pri datoteki " -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "name¹èanje izvornega paketa\n" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "ni mo¾no ustvariti izvornega imenika %s" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "ni mo¾no pisanje na %s" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "izvori v: %s\n" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "ni mo¾no ustvariti imenika z doloèili spec %s" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "datoteka spec v: %s\n" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "preimenujemo %s v %s\n" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "preimenovanje %s v %s neuspe¹no: %s" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "prièakovan izvorni paket, najden binarni" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "ustavljamo namestitev ker teèemo kot --test\n" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "poganjamo prednamestitvene skripte (èe obstajajo)\n" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "opozorilo: %s ustvarjen kot %s" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "opozorilo: %s shranjen kot %s" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "poganjamo ponamestitvene skripte (èe obstajajo)\n" @@ -3385,7 +3385,7 @@ msgstr "staro obliko podatkove zbirke pretvorite v novo z --rebuilddb" msgid "error(%d) counting packages" msgstr "napaka pri iskanju paketa %s\n" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "ni mo¾no prebrati glave pri %d za vpogled" @@ -3425,11 +3425,6 @@ msgstr "preimenujemo %s v %s\n" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3824,27 +3819,27 @@ msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\"" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\"" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "izkljuèujemo datoteko %s%s\n" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèujemo imenik %s\n" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "prestavljamo %s v %s\n" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "prestavljamo imenik %s v %s\n" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" @@ -3864,16 +3859,16 @@ msgstr "odstranitev imenika %s neuspe msgid "removal of %s failed: %s" msgstr "odstranitev %s neuspe¹na: %s" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "datoteke bomo odstranili, test = %d\n" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "poganjamo poodnamestitvene skripte (èe obstajajo)\n" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "skript se ni uspe¹no izvedel" diff --git a/po/sr.po b/po/sr.po index 2be4a50..e37ce5e 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" @@ -244,9 +244,9 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" -msgstr "" +#, fuzzy +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" +msgstr "\t\t\t paket1 ...paketN" #: rpm.c:230 rpmqv.c:324 msgid "" @@ -1715,169 +1715,169 @@ msgstr "" msgid "syntax error in expression" msgstr "oèekivan znak ? u izrazu" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, fuzzy, c-format msgid "Missing '(' in %s %s" msgstr "nedostaje { posle %" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, fuzzy, c-format msgid "Missing ')' in %s(%s" msgstr "nedostaje ':' na %s:%d" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, fuzzy, c-format msgid "Bad syntax: %s(%s)" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:393 +#: build/files.c:395 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, fuzzy, c-format msgid "Two files on one line: %s" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:679 +#: build/files.c:713 #, fuzzy, c-format msgid "File must begin with \"/\": %s" msgstr "preme¹tanja moraju poèeti znakom '/'" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, fuzzy, c-format msgid "File listed twice: %s" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:958 +#: build/files.c:1008 #, fuzzy, c-format msgid "File not found: %s" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1160 +#: build/files.c:1221 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, fuzzy, c-format msgid "Bad file: %s: %s" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Ne mogu da izvr¹im PGP" -#: build/files.c:1566 +#: build/files.c:1627 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Ne mogu da proèitam 'sigtarget'" -#: build/files.c:1648 +#: build/files.c:1709 #, fuzzy, c-format msgid "%s failed" msgstr "PGP omanuo" -#: build/files.c:1652 +#: build/files.c:1713 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:1886 +#: build/files.c:1957 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "neuspelo otvaranje %s: %s" @@ -2151,32 +2151,32 @@ msgstr "preme msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "pogre¹an broj paketa: %s\n" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, fuzzy, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "nedostaje arhitektura za %s na %s:%d" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Opcije odrednice paketa:" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2240,23 +2240,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, fuzzy, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "preme¹tanja moraju poèeti znakom '/'" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, fuzzy, c-format msgid "line %d: File name not permitted: %s" msgstr "paket %s nije naveden u %s" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, fuzzy, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "paket %s nije naveden u %s" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, fuzzy, c-format msgid "line %d: Version required: %s" msgstr "neuspelo otvaranje %s: %s" @@ -2397,91 +2397,91 @@ msgid " failed - " msgstr "PGP omanuo" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, fuzzy, c-format msgid "%s: %-45s YES (added package)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, fuzzy, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "paket %s nije naveden u %s" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "petlja u lancu: %s" @@ -2658,7 +2658,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2731,7 +2731,7 @@ msgstr "| o msgid "(unknown type)" msgstr "(nepoznat tip)" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, fuzzy, c-format msgid " file: %s action: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -2752,88 +2752,88 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 #, fuzzy msgid "installing a source package\n" msgstr "instaliraj paket" -#: lib/install.c:449 +#: lib/install.c:622 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, fuzzy, c-format msgid "cannot write to %s" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/install.c:489 +#: lib/install.c:662 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 #, fuzzy msgid "source package contains no .spec file" msgstr "upit nad paketom koji ima " -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "preimenovanje %s u %s nije uspelo: %s" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3421,7 +3421,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "gre¹ka kod potrage za paketom %s\n" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "ne mogu da proèitam zaglavlje na %d za proveru" @@ -3461,11 +3461,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" @@ -3873,27 +3868,27 @@ msgstr "Morate podesiti \"pgp_name:\" u va msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, fuzzy, c-format msgid "excluding file %s%s\n" msgstr "Pribavljam %s\n" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3913,16 +3908,16 @@ msgstr "neuspela komanda rmdir %s: %s" msgid "removal of %s failed: %s" msgstr "uklanjanje %s nije uspelo: %s" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "neuspelo izvr¹avanje skripta" diff --git a/po/sv.po b/po/sv.po index 5973814..881ca6d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 3.0.4\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: 2000-06-22 23:35+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -237,8 +237,8 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr " [--whatprovides] [--whatrequires] [--requires]" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +#, fuzzy +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--triggeredby] [--ftpuseport] [--ftpproxy ]" @@ -1609,168 +1609,168 @@ msgstr "&& och || st msgid "syntax error in expression" msgstr "syntaxfel i uttryck" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "TIMECHECK-fel: %s\n" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "Saknad \"(\" i %s %s" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "Saknad \")\" i %s(%s" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "Ogiltig %s token: %s" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "Annat än blanktecken följer på %s(): %s" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "Felaktig syntax: %s(%s)" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "Felaktig rättighetsspecifikation: %s(%s)" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "Felaktig specifikation av katalogrättigheter: %s(%s)" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "Ovanlig lokallängd: \"%.*s\" i %%langg(%s)" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "Duplicerad lokal %.*s i %%lang(%s)" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "Slog i gränsen för %%docdir" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "Endast ett argument till %%docdir" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "Två filer på en rad: %s" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "Filnamn måste börja med \"/\": %s" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "Kan inte blanda special %%doc med andra former: %s" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "Filen uppräknad två gånger: %s" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "Symbolisk länk pekar på BuildRoot: %s -> %s" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "Filen matchar inte prefixet (%s): %s" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "Filen hittades inte: %s" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "Felaktig ägare/grupp: %s\n" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Fil %4d: %07o %s.%s\t %s\n" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "Filen behöver inledande \"/\": %s" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "Ingen file hittades vid matchningen: %s" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "Kunde inte öppna %%files-fil %s: %s" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "rad: %s" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "Felaktig fil: %s: %s" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "Felaktig ägare/grupp: %s" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "Kunde inte köra %s: %s" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "Kunde inte grena %s: %s" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "kunde inte skriva all data till %s" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "Letar upp %s: (använder %s)...\n" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "Misslyckades hitta %s:" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Bearbetar filer: %s-%s-%s\n" @@ -2044,32 +2044,32 @@ msgstr "rad %d: Docdir m msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "rad %d: Epoch/Serial-fält måste vara numeriskt: %s" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "rad %d: Felaktig BuildArchitecture-format: %s" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "Internt fel: felaktig tagg %d" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "Felaktig paketspecifikation: %s" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "Paketet existerar redan: %s" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "rad %d: Okänd tagg: %s" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "Spec-fil kan inte använda BuildRoot" @@ -2133,23 +2133,23 @@ msgstr "rad %d: Felaktigt argument till %%patch: %s" msgid "line %d: second %%prep" msgstr "rad %d: andra %%prep" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "rad %d: Beroenden måste börja alfanumeriskt, med \"_\" eller \"/\": %s" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "rad %d: Filnamn inte tillåtna: %s" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "rad %d: Versionsfilnamn inte tillåtet: %s" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "rad %d: Version krävs: %s" @@ -2285,7 +2285,7 @@ msgid " failed - " msgstr " misslyckades - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2294,84 +2294,84 @@ msgstr "" "\"B\"-beroendet beghöver en epok (antar samma som \"A\")\n" " A %s B %s\n" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %-45s JA (lade till filer)\n" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "%s: %-45s JA (lade till paket)\n" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "%s: %-45s JA (lade till paket, BORDE INTE HÄNDA)\n" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %-45s JA (lade till tillhandahållande)\n" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "%s: %-45s %-3s (cachad)\n" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s JA (db-filer)\n" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s JA (db tillhandahållande)\n" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "%s: %-45s JA (db-paket)\n" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "%s: %45s JA (rpmlib-version)\n" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NEJ\n" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "paket %s behov inte uppfyllda: %s\n" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s står i konflikt: %s\n" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "cirkularitet i kedja av förutsättningar: %s" @@ -2553,7 +2553,7 @@ msgstr "filen %s msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE måste vara 1.\n" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" @@ -2624,7 +2624,7 @@ msgstr "| f msgid "(unknown type)" msgstr "(okänd typ)" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr " fil: %s åtgärd: %s\n" @@ -2645,86 +2645,86 @@ msgstr "%%instchangelog-v #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "uppackning av arkiv misslyckades%s%s: %s" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr " vid fil " -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "installerar källpaket\n" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "kan inte skapa källkatalog %s" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "kan inte skriva till %s" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "källkod i: %s\n" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "kan inte skapa spec-katalog %s" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "spec-fil i: %s\n" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "källpaket innehåller ingen spec-fil" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "byter namn på %s till %s\n" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "namnbyte från %s till %s misslyckades: %s" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "källpaket förväntades, fann binärpaket" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "paket: %s-%s-%s filtest = %d\n" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "avbryter installation eftersom vi kör --test\n" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "kör (eventuellt) preinstalltionsskript\n" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "varning: %s skapades som %s" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "varning: %s sparades som %s" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "kör (eventuellt) postinstallationsskript\n" @@ -3315,7 +3315,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "fel(%d) när paket räknades" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "%s: kan inte läsa huvud vid 0x%x" @@ -3355,11 +3355,6 @@ msgstr "l msgid "adding %d entries to %s index:\n" msgstr "lägger till %d poster till %s-index:\n" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3752,27 +3747,27 @@ msgstr "Du m msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "Du måste sätta \"%%_pgp_name\" i din makrofil" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "hoppar över %s%s\n" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "flyttar %s till %s\n" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "flyttar katalogen %s till %s\n" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" @@ -3792,16 +3787,16 @@ msgstr "rmdir av %s misslyckades: %s" msgid "removal of %s failed: %s" msgstr "borttagning av %s misslyckades: %s" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "tar bort filer test = %d\n" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "kör (eventuellt) postavinstallationsskript\n" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "skriptkörning misslyckades" diff --git a/po/tr.po b/po/tr.po index cea06c0..16603e6 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -267,8 +267,7 @@ msgstr "" #: rpm.c:228 rpmqv.c:322 #, fuzzy -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" " [--ftpuseport] [--ftpproxy ] [--ftpport " "]" @@ -1761,169 +1760,169 @@ msgstr "" msgid "syntax error in expression" msgstr "dizi içerisinde ? bekleniyordu" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, fuzzy, c-format msgid "Missing '(' in %s %s" msgstr "% den sonra eksik {" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, fuzzy, c-format msgid "Missing ')' in %s(%s" msgstr "%s te eksik ':' :%d" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, fuzzy, c-format msgid "Bad syntax: %s(%s)" msgstr "%s okunamadý: %s" -#: build/files.c:393 +#: build/files.c:395 #, fuzzy, c-format msgid "Bad mode spec: %s(%s)" msgstr "%s okunamadý: %s" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, fuzzy, c-format msgid "Two files on one line: %s" msgstr "%s açýlamadý: %s" -#: build/files.c:679 +#: build/files.c:713 #, fuzzy, c-format msgid "File must begin with \"/\": %s" msgstr "relocate iþlemi / ile baþlamalý" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, fuzzy, c-format msgid "File listed twice: %s" msgstr "%s okunamadý: %s" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s" msgstr "%s okunamadý: %s" -#: build/files.c:958 +#: build/files.c:1008 #, fuzzy, c-format msgid "File not found: %s" msgstr "Dosya sunucuda bulunamadý" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "%s açýlamadý: %s" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Dosya sunucuda bulunamadý" -#: build/files.c:1160 +#: build/files.c:1221 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "hata: %s dosyasý okunamadý\n" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, fuzzy, c-format msgid "Bad file: %s: %s" msgstr "%s açýlamadý: %s" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "PGP çalýþtýrýlamadý" -#: build/files.c:1566 +#: build/files.c:1627 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Ýmza hedefi 'sigtarget' okunamadý" -#: build/files.c:1648 +#: build/files.c:1709 #, fuzzy, c-format msgid "%s failed" msgstr "PGP hata verdi" -#: build/files.c:1652 +#: build/files.c:1713 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "%s yaratýlamýyor\n" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "%s yaratýlamýyor\n" -#: build/files.c:1886 +#: build/files.c:1957 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "%s açýlamadý: %s" @@ -2198,32 +2197,32 @@ msgstr "relocate i msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "geçersiz paket numarsý: %s\n" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, fuzzy, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "%s için %s te eksik mimari:%d" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Paket seçim seçenekleri:" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2287,23 +2286,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, fuzzy, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "relocate iþlemi / ile baþlamalý" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, fuzzy, c-format msgid "line %d: File name not permitted: %s" msgstr "%s paketi %s altýnda gözükmüyor" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, fuzzy, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "%s paketi %s altýnda gözükmüyor" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, fuzzy, c-format msgid "line %d: Version required: %s" msgstr "%s açýlamadý: %s" @@ -2445,91 +2444,91 @@ msgid " failed - " msgstr "PGP hata verdi" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, fuzzy, c-format msgid "%s: %-45s YES (added package)\n" msgstr "%s dosyasý, hiç bir pakete ait deðil\n" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, fuzzy, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "%s dosyasý, hiç bir pakete ait deðil\n" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s dosyasý, hiç bir pakete ait deðil\n" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, fuzzy, c-format msgid "package %s require not satisfied: %s\n" msgstr "%s paketi %s altýnda gözükmüyor" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "%s paketi %s altýnda gözükmüyor" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "gerekenler zincirinde döngü: %s" @@ -2706,7 +2705,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2779,7 +2778,7 @@ msgstr "dizinin sonunda | bekleniyordu" msgid "(unknown type)" msgstr "(bilinmeyen tip)" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, fuzzy, c-format msgid " file: %s action: %s\n" msgstr "%s açýlamadý: %s" @@ -2800,88 +2799,88 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 #, fuzzy msgid "installing a source package\n" msgstr "paket yüklemek" -#: lib/install.c:449 +#: lib/install.c:622 #, fuzzy, c-format msgid "cannot create sourcedir %s" msgstr "%s dosyasý açýlamýyor: " -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, fuzzy, c-format msgid "cannot write to %s" msgstr "%s dosyasý açýlamýyor: " -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, fuzzy, c-format msgid "cannot create specdir %s" msgstr "%s dosyasý açýlamýyor: " -#: lib/install.c:489 +#: lib/install.c:662 #, fuzzy, c-format msgid "spec file in: %s\n" msgstr "%s açýlamadý: %s" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 #, fuzzy msgid "source package contains no .spec file" msgstr " isimli dosyayý içeren paketi sorgulamak" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s 'nin isminin %s 'ye çevrilmesinde belirtilen hata oluþtu: %s" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3472,7 +3471,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "%s pakedi aranýrken hata oluþtu\n" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x" msgstr "%d kaydýndan baþlýk bilgisi okunamadý" @@ -3512,11 +3511,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" @@ -3924,27 +3918,27 @@ msgstr "rpmrc dosyan msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "rpmrc dosyanýzda \"pgp_name:\" tanýmlanmýþ olmalý" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, fuzzy, c-format msgid "excluding file %s%s\n" msgstr "%s alýnýyor\n" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "%s dizinin oluþturulmasýnda hata: %s" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "%s dizinin oluþturulmasýnda hata: %s" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3964,16 +3958,16 @@ msgstr "%s dizinin silinmesinde belirtilen hata olu msgid "removal of %s failed: %s" msgstr "%s 'in silinmesinde belirtilen hata oluþtu: %s" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "betik (script) çalýþtýrýlamadý " diff --git a/po/uk.po b/po/uk.po index 71a2cb5..32b2109 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-22 21:17-0400\n" +"POT-Creation-Date: 2000-07-05 16:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -231,8 +231,7 @@ msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" #: rpm.c:228 rpmqv.c:322 -msgid "" -" [--triggeredby] [--ftpuseport] [--ftpproxy ]" +msgid " [--triggeredby] [--ftpport] [--ftpproxy ]" msgstr "" #: rpm.c:230 rpmqv.c:324 @@ -1561,168 +1560,168 @@ msgstr "" msgid "syntax error in expression" msgstr "" -#: build/files.c:202 +#: build/files.c:204 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:247 build/files.c:329 build/files.c:492 +#: build/files.c:249 build/files.c:331 build/files.c:494 #, c-format msgid "Missing '(' in %s %s" msgstr "" -#: build/files.c:258 build/files.c:446 build/files.c:503 +#: build/files.c:260 build/files.c:448 build/files.c:505 #, c-format msgid "Missing ')' in %s(%s" msgstr "" -#: build/files.c:296 build/files.c:471 +#: build/files.c:298 build/files.c:473 #, c-format msgid "Invalid %s token: %s" msgstr "" -#: build/files.c:345 +#: build/files.c:347 #, c-format msgid "Non-white space follows %s(): %s" msgstr "" -#: build/files.c:383 +#: build/files.c:385 #, c-format msgid "Bad syntax: %s(%s)" msgstr "" -#: build/files.c:393 +#: build/files.c:395 #, c-format msgid "Bad mode spec: %s(%s)" msgstr "" -#: build/files.c:405 +#: build/files.c:407 #, c-format msgid "Bad dirmode spec: %s(%s)" msgstr "" -#: build/files.c:529 +#: build/files.c:531 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)" msgstr "" -#: build/files.c:539 +#: build/files.c:541 msgid "Duplicate locale %.*s in %%lang(%s)" msgstr "" -#: build/files.c:635 +#: build/files.c:666 msgid "Hit limit for %%docdir" msgstr "" -#: build/files.c:641 +#: build/files.c:672 msgid "Only one arg for %%docdir" msgstr "" #. We already got a file -- error -#: build/files.c:666 +#: build/files.c:700 #, c-format msgid "Two files on one line: %s" msgstr "" -#: build/files.c:679 +#: build/files.c:713 #, c-format msgid "File must begin with \"/\": %s" msgstr "" -#: build/files.c:691 +#: build/files.c:725 msgid "Can't mix special %%doc with other forms: %s" msgstr "" -#: build/files.c:777 +#: build/files.c:812 #, c-format msgid "File listed twice: %s" msgstr "" -#: build/files.c:870 +#: build/files.c:913 #, c-format msgid "Symlink points to BuildRoot: %s -> %s" msgstr "" -#: build/files.c:948 +#: build/files.c:998 #, c-format msgid "File doesn't match prefix (%s): %s" msgstr "" -#: build/files.c:958 +#: build/files.c:1008 #, c-format msgid "File not found: %s" msgstr "" -#: build/files.c:1001 +#: build/files.c:1051 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1015 +#: build/files.c:1065 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1084 +#: build/files.c:1139 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1113 +#: build/files.c:1168 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1160 +#: build/files.c:1221 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1167 build/pack.c:100 +#: build/files.c:1228 build/pack.c:100 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1494 +#: build/files.c:1555 #, c-format msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1506 build/parsePrep.c:34 +#: build/files.c:1567 build/parsePrep.c:34 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1561 +#: build/files.c:1622 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1566 +#: build/files.c:1627 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1648 +#: build/files.c:1709 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1652 +#: build/files.c:1713 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1742 +#: build/files.c:1809 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1770 build/files.c:1779 +#: build/files.c:1837 build/files.c:1847 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1886 +#: build/files.c:1957 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1996,32 +1995,32 @@ msgstr "" msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: build/parsePreamble.c:542 +#: build/parsePreamble.c:541 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:552 +#: build/parsePreamble.c:551 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:692 +#: build/parsePreamble.c:691 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:698 +#: build/parsePreamble.c:697 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:725 +#: build/parsePreamble.c:724 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:750 +#: build/parsePreamble.c:749 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2085,23 +2084,23 @@ msgstr "" msgid "line %d: second %%prep" msgstr "" -#: build/parseReqs.c:96 +#: build/parseReqs.c:97 #, c-format msgid "" "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s" msgstr "" -#: build/parseReqs.c:107 +#: build/parseReqs.c:108 #, c-format msgid "line %d: File name not permitted: %s" msgstr "" -#: build/parseReqs.c:139 +#: build/parseReqs.c:140 #, c-format msgid "line %d: Versioned file name not permitted: %s" msgstr "" -#: build/parseReqs.c:170 +#: build/parseReqs.c:171 #, c-format msgid "line %d: Version required: %s" msgstr "" @@ -2237,91 +2236,91 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:434 +#: lib/depends.c:467 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:463 +#: lib/depends.c:496 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:786 +#: lib/depends.c:838 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:835 +#: lib/depends.c:887 #, c-format msgid "%s: %-45s YES (added package)\n" msgstr "" -#: lib/depends.c:839 +#: lib/depends.c:891 #, c-format msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" msgstr "" -#: lib/depends.c:858 +#: lib/depends.c:910 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:902 +#: lib/depends.c:954 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:919 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:942 +#: lib/depends.c:994 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:1007 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:1021 #, c-format msgid "%s: %-45s YES (db packages)\n" msgstr "" -#: lib/depends.c:986 +#: lib/depends.c:1038 #, c-format msgid "%s: %-45s YES (rpmlib version)\n" msgstr "" -#: lib/depends.c:997 +#: lib/depends.c:1049 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:1070 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1067 +#: lib/depends.c:1124 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1129 +#: lib/depends.c:1191 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1256 +#: lib/depends.c:1318 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2498,7 +2497,7 @@ msgstr "" msgid "grabData() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:250 lib/header.c:815 +#: lib/header.c:250 lib/header.c:815 lib/install.c:323 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2569,7 +2568,7 @@ msgstr "" msgid "(unknown type)" msgstr "" -#: lib/install.c:148 lib/uninstall.c:188 +#: lib/install.c:148 lib/uninstall.c:189 #, c-format msgid " file: %s action: %s\n" msgstr "" @@ -2590,86 +2589,86 @@ msgstr "" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error -#: lib/install.c:384 +#: lib/install.c:557 #, c-format msgid "unpacking of archive failed%s%s: %s" msgstr "" -#: lib/install.c:385 +#: lib/install.c:558 msgid " on file " msgstr "" -#: lib/install.c:429 +#: lib/install.c:602 msgid "installing a source package\n" msgstr "" -#: lib/install.c:449 +#: lib/install.c:622 #, c-format msgid "cannot create sourcedir %s" msgstr "" -#: lib/install.c:455 lib/install.c:485 +#: lib/install.c:628 lib/install.c:658 #, c-format msgid "cannot write to %s" msgstr "" -#: lib/install.c:459 +#: lib/install.c:632 #, c-format msgid "sources in: %s\n" msgstr "" -#: lib/install.c:479 +#: lib/install.c:652 #, c-format msgid "cannot create specdir %s" msgstr "" -#: lib/install.c:489 +#: lib/install.c:662 #, c-format msgid "spec file in: %s\n" msgstr "" -#: lib/install.c:523 lib/install.c:551 +#: lib/install.c:696 lib/install.c:724 msgid "source package contains no .spec file" msgstr "" -#: lib/install.c:573 +#: lib/install.c:746 #, c-format msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:575 lib/install.c:849 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" -#: lib/install.c:666 +#: lib/install.c:840 msgid "source package expected, binary found" msgstr "" -#: lib/install.c:721 +#: lib/install.c:897 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:779 +#: lib/install.c:957 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:784 +#: lib/install.c:962 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:809 +#: lib/install.c:987 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:845 +#: lib/install.c:1024 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:918 +#: lib/install.c:1112 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -3225,7 +3224,7 @@ msgstr "" msgid "error(%d) counting packages" msgstr "" -#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:90 +#: lib/rpmdb.c:1152 lib/rpmdb.c:1665 lib/uninstall.c:91 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" @@ -3265,11 +3264,6 @@ msgstr "" msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:1965 -#, c-format -msgid "%6d %s\n" -msgstr "" - #: lib/rpmdb.c:2316 #, c-format msgid "rebuilding database %s into %s\n" @@ -3662,27 +3656,27 @@ msgstr "" msgid "You must set \"%%_pgp_name\" in your macro file" msgstr "" -#: lib/transaction.c:399 +#: lib/transaction.c:412 #, c-format msgid "excluding file %s%s\n" msgstr "" -#: lib/transaction.c:425 lib/transaction.c:508 +#: lib/transaction.c:438 lib/transaction.c:521 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:430 +#: lib/transaction.c:443 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:501 +#: lib/transaction.c:514 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:653 +#: lib/transaction.c:666 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3702,16 +3696,16 @@ msgstr "" msgid "removal of %s failed: %s" msgstr "" -#: lib/uninstall.c:134 +#: lib/uninstall.c:135 #, c-format msgid "will remove files test = %d\n" msgstr "" -#: lib/uninstall.c:202 +#: lib/uninstall.c:203 msgid "running postuninstall script (if any)\n" msgstr "" -#: lib/uninstall.c:395 +#: lib/uninstall.c:396 msgid "execution of script failed" msgstr "" diff --git a/rpm.spec b/rpm.spec index 2a86faf..470f710 100644 --- a/rpm.spec +++ b/rpm.spec @@ -5,7 +5,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 4.0 Version: %{version} -Release: 0.45 +Release: 0.46 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -254,6 +254,10 @@ fi %{__prefix}/include/popt.h %changelog +* Wed Jul 5 2000 Jeff Johnson +- change optflags for i386. +- multilib patch, take 1. + * Fri Jun 23 2000 Jeff Johnson - i486 optflags typo fixed. diff --git a/rpmrc.in b/rpmrc.in index c714e89..fb62108 100644 --- a/rpmrc.in +++ b/rpmrc.in @@ -1,4 +1,4 @@ -# $Id: rpmrc.in,v 2.27 2000/06/23 13:29:55 jbj Exp $ +# $Id: rpmrc.in,v 2.28 2000/07/05 20:39:15 jbj Exp $ ############################################################# @@ -7,7 +7,9 @@ ############################################################# # Values for RPM_OPT_FLAGS for various platforms -optflags: i386 -O2 -m486 -fno-strength-reduce +# XXX this is the i386 optflags that rpm has traditionally used in the past. +#optflags: i386 -O2 -m486 -fno-strength-reduce +optflags: i386 -O2 -march=i386 -mcpu=i686 optflags: i486 -O2 -march=i486 optflags: i586 -O2 -march=i586 optflags: i686 -O2 -march=i686