From 77ea46f6a0f1a0d1240ab76ead01d7e4ffb9e62d Mon Sep 17 00:00:00 2001 From: jbj Date: Sat, 15 Jul 2000 14:53:54 +0000 Subject: [PATCH] - rip out pre-transaction syscalls, more design is needed. - display rpmlib provides when invoked with --showrc. - remove (dead) dependency checks on implicitly provided package names. - remove (dead) rpmdb API code in python bindings. - remove (legacy) support for version 1 packaging. - remove (legacy) support for converting gdbm databases. CVS patchset: 3950 CVS date: 2000/07/15 14:53:54 --- CHANGES | 6 ++ Makefile.am | 9 -- build/parsePreamble.c | 18 ---- configure.in | 24 ------ lib/Makefile.am | 2 +- lib/cpio.c | 1 + lib/depends.c | 52 +----------- lib/install.c | 7 -- lib/package.c | 221 ++------------------------------------------------ lib/problems.c | 2 +- lib/rpmlib.h | 11 +-- lib/rpmlibprov.c | 29 +++++-- lib/rpmrc.c | 47 ++++++----- lib/transaction.c | 29 ------- perl/Makefile.in | 1 - po/cs.po | 151 ++++++++++++++++------------------ po/da.po | 122 ++++++++++------------------ po/de.po | 137 +++++++++++++------------------ po/es.po | 122 ++++++++++------------------ po/fi.po | 137 +++++++++++++------------------ po/fr.po | 126 +++++++++++----------------- po/gl.po | 122 ++++++++++------------------ po/hu.po | 122 ++++++++++------------------ po/id.po | 122 ++++++++++------------------ po/is.po | 122 ++++++++++------------------ po/it.po | 122 ++++++++++------------------ po/ja.po | 153 ++++++++++++++++------------------ po/ko.po | 122 ++++++++++------------------ po/no.po | 122 ++++++++++------------------ po/pl.po | 151 ++++++++++++++++------------------ po/pt.po | 122 ++++++++++------------------ po/pt_BR.po | 128 +++++++++++------------------ po/ro.po | 122 ++++++++++------------------ po/rpm.pot | 122 ++++++++++------------------ po/ru.po | 150 ++++++++++++++++------------------ po/sk.po | 150 ++++++++++++++++------------------ po/sl.po | 152 ++++++++++++++++------------------ po/sr.po | 138 +++++++++++++------------------ po/sv.po | 151 ++++++++++++++++------------------ po/tr.po | 137 +++++++++++++------------------ po/uk.po | 122 ++++++++++------------------ python/Makefile.in | 1 - python/rpmmodule.c | 105 ------------------------ python/upgrade.c | 136 +------------------------------ rpm.spec | 10 ++- scripts/Makefile.in | 1 - 46 files changed, 1438 insertions(+), 2721 deletions(-) diff --git a/CHANGES b/CHANGES index 9dd971e..7c940b4 100644 --- a/CHANGES +++ b/CHANGES @@ -86,6 +86,12 @@ - add S_ISLNK pre-transaction syscall test. - fix: initialize pretransaction argv (segfault). - fix: check rpmlib features w/o database (and check earlier as well). + - rip out pre-transaction syscalls, more design is needed. + - display rpmlib provides when invoked with --showrc. + - remove (dead) dependency checks on implicitly provided package names. + - remove (dead) rpmdb API code in python bindings. + - remove (legacy) support for version 1 packaging. + - remove (legacy) support for converting gdbm databases. 3.0.4 -> 3.0.5 - handle version 4 packaging as input. diff --git a/Makefile.am b/Makefile.am index efe92a1..0bf9876 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,8 +10,6 @@ EXTRA_DIST = CHANGES CREDITS GROUPS README.amiga INSTALL \ python/*.am python/*.in python/*.c python/*.h python/testit \ rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.spec -EXTRA_PROGRAMS = rpmconvert - # XXX TODO: python perl SUBDIRS = intl po popt rpmio lib build misc tools scripts tests doc . @@ -36,8 +34,6 @@ rpmbin_PROGRAMS = rpm bin_PROGRAMS = rpm2cpio bin_SCRIPTS = gendiff -noinst_PROGRAMS = @BUILD_RPMCONVERT@ - pkglibdir = @RPMCONFIGDIR@ pkglib_PROGRAMS = rpmb rpmdb rpmi rpmk rpmq pkglib_DATA = rpmrc rpmpopt-$(VERSION) macros @@ -88,11 +84,6 @@ rpm2cpio_SOURCES = rpm2cpio.c rpm2cpio_LDFLAGS = @LDFLAGS_STATIC@ $(myLDFLAGS) rpm2cpio_LDADD = $(myLDADD) @LIBMISC@ -rpmconvert_SOURCES = convertdb.c oldrpmdb.c -## Libmisc.a is required for rpmconvert. -rpmconvert_LDFLAGS = $(myLDFLAGS) -rpmconvert_LDADD = $(myLDADD) -lgdbm - $(PROGRAMS): $(myLDADD) .PHONY: lclint diff --git a/build/parsePreamble.c b/build/parsePreamble.c index f2b8ce7..04787da 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -532,20 +532,6 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, const char *macro, FREE(spec->buildArchitectures); break; - case RPMTAG_PRETRANSACTION: - case RPMTAG_POSTTRANSACTION: - if ((rc = rpmSyscall(field, 1)) != 0) { - rpmError(RPMERR_BADSPEC, - _("line %d: Invalid %s tag value: %s"), - spec->lineNum, tagName(tag), spec->line); - return RPMERR_BADSPEC; - } - headerAddOrAppendEntry(pkg->header, tag, RPM_STRING_ARRAY_TYPE, - &field, 1); - rpmlibNeedsFeature(pkg->header, "PreTransactionSyscalls", "4.0-1"); - macro = NULL; - break; - default: rpmError(RPMERR_INTERNAL, _("Internal error: Bogus tag %d"), tag); return RPMERR_INTERNAL; @@ -606,10 +592,6 @@ static struct PreambleRec { {RPMTAG_AUTOREQ, 0, 0, "autoreq"}, {RPMTAG_AUTOPROV, 0, 0, "autoprov"}, {RPMTAG_DOCDIR, 0, 0, "docdir"}, - {RPMTAG_PRETRANSACTION, 0, 0, "pretransaction"}, -#ifdef NOTYET - {RPMTAG_POSTTRANSACTION, 0, 0, "posttransaction"}, -#endif {0, 0, 0, 0} }; diff --git a/configure.in b/configure.in index 8b259c3..b56f387 100644 --- a/configure.in +++ b/configure.in @@ -260,15 +260,6 @@ dnl dnl Check for features dnl -### use option --disable-v1-packages to turn off support for rpm-1.x packages -AC_MSG_CHECKING(if you want support for rpm-1.0 packages) -AC_ARG_ENABLE(v1-packages, - [ --disable-v1-packages[=no] disable support for rpm-1.x packages], - [with_v1_packages=$enableval], - [with_v1_packages=yes]) -AC_MSG_RESULT($with_v1_packages) -test "$with_v1_packages" = yes && AC_DEFINE(ENABLE_V1_PACKAGES) - ### use option --enable-v5-packages to turn on support for rpm-5.x packages AC_MSG_CHECKING(if you want experimental rpm-5.0 packages) AC_ARG_ENABLE(v5-packages, @@ -419,21 +410,6 @@ AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/param.h sys/vmount.h) AC_CHECK_HEADERS(bzlib.h libio.h zlib.h) AC_CHECK_HEADERS(err.h mcheck.h) -dnl whether or not we should try build rpmconvert, which is used to convert -dnl rpm databases from rpm 1.x to rpm 2.x or later. It requires the gdbm -dnl library and header file. -BUILD_RPMCONVERT=yes -AC_CHECK_HEADERS(gdbm.h,BUILD_RPMCONVERT=yes,BUILD_RPMCONVERT=no) -AC_MSG_CHECKING(if rpmconvert should be built) -if test X"$BUILD_RPMCONVERT" = X"yes"; then - BUILD_RPMCONVERT=rpmconvert - AC_MSG_RESULT(yes) -else - BUILD_RPMCONVERT= - AC_MSG_RESULT(no) -fi -AC_SUBST(BUILD_RPMCONVERT) - dnl whether or not we should try to build rpmgettext/rpmputtext. if test X"$USE_NLS" = Xyes; then BUILD_RPMNLSTOOLS="rpmgettext rpmputtext" diff --git a/lib/Makefile.am b/lib/Makefile.am index b6988f9..7c3fe89 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -22,7 +22,7 @@ LIBS= lib_LTLIBRARIES = librpm.la librpm_la_SOURCES = \ - cpio.c $(DBLIBOBJS) depends.c fileutil.c \ + cpio.c $(DBLIBOBJS) depends.c \ formats.c fprint.c fs.c hash.c header.c install.c \ md5.c md5sum.c misc.c oldheader.c package.c problems.c \ poptBT.c poptQV.c query.c rpmchecksig.c rpmdb.c rpminstall.c \ diff --git a/lib/cpio.c b/lib/cpio.c index ce52fb9..e4e1ccf 100644 --- a/lib/cpio.c +++ b/lib/cpio.c @@ -223,6 +223,7 @@ int cpioFileMapCmp(const void * a, const void * b) const char * afn = ((const struct cpioFileMapping *)a)->archivePath; const char * bfn = ((const struct cpioFileMapping *)b)->archivePath; + /* Match payloads with ./ prefixes as well. */ if (afn[0] == '.' && afn[1] == '/') afn += 2; if (bfn[0] == '.' && bfn[1] == '/') bfn += 2; diff --git a/lib/depends.c b/lib/depends.c index 6a2a017..b69bae5 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -61,7 +61,7 @@ static /*@only@*/ char *printDepend(const char * depend, const char * key, const return tbuf; } -#ifdef DYING +#ifdef UNUSED static /*@only@*/ const char *buildEVR(int_32 *e, const char *v, const char *r) { const char *pEVR; @@ -337,9 +337,6 @@ static void alMakeIndex(struct availableList * al) if (ai->size) return; -#ifdef DYING - ai->size = al->size; -#endif for (i = 0; i < al->size; i++) ai->size += al->list[i].providesCount; @@ -348,14 +345,6 @@ static void alMakeIndex(struct availableList * al) k = 0; for (i = 0; i < al->size; i++) { -#ifdef DYING - ai->index[k].package = al->list + i; - ai->index[k].entry = al->list[i].name; - ai->index[k].entryLen = strlen(al->list[i].name); - ai->index[k].type = IET_NAME; - k++; -#endif - for (j = 0; j < al->list[i].providesCount; j++) { /* If multilib install, skip non-multilib provides. */ @@ -866,29 +855,6 @@ alFileSatisfiesDepend(struct availableList * al, p = match->package; rc = 0; switch (match->type) { - case IET_NAME: -#ifdef DYING - { const char *pEVR; - char *t; - int pFlags = RPMSENSE_EQUAL; - - pEVR = t = alloca(21 + strlen(p->version) + 1 + strlen(p->release) + 1); - *t = '\0'; - if (p->epoch) { - sprintf(t, "%d:", *p->epoch); - while (*t) - t++; - } - (void) stpcpy( stpcpy( stpcpy(t, p->version) , "-") , p->release); - rc = rpmRangesOverlap(p->name, pEVR, pFlags, keyName, keyEVR, keyFlags); - if (keyType && keyDepend && rc) - rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added package)\n"), - keyType, keyDepend+2); - } break; -#else - rpmError(RPMERR_INTERNAL, _("%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"), keyType, keyDepend+2); - break; -#endif case IET_PROVIDES: for (i = 0; i < p->providesCount; i++) { const char *proEVR; @@ -1022,22 +988,6 @@ static int unsatisfiedDepend(rpmTransactionSet rpmdep, } } rpmdbFreeIterator(mi); - -#ifdef DYING - mi = rpmdbInitIterator(rpmdep->rpmdb, RPMTAG_NAME, keyName, 0); - rpmdbPruneIterator(mi, - rpmdep->removedPackages, rpmdep->numRemovedPackages, 1); - while ((h = rpmdbNextIterator(mi)) != NULL) { - if (headerMatchesDepFlags(h, keyName, keyEVR, keyFlags)) { - rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (db packages)\n"), - keyType, keyDepend+2); - rpmdbFreeIterator(mi); - goto exit; - } - } - rpmdbFreeIterator(mi); -#endif - } if (suggestion) diff --git a/lib/install.c b/lib/install.c index 2393e5f..a7d8b5f 100644 --- a/lib/install.c +++ b/lib/install.c @@ -841,13 +841,6 @@ int rpmInstallSourcePackage(const char * rootdir, FD_t fd, return 2; } -#if defined(ENABLE_V1_PACKAGES) - if (major == 1) { - notify = NULL; - h = NULL; - } -#endif /* ENABLE_V1_PACKAGES */ - if (cookie) { *cookie = NULL; if (h != NULL && diff --git a/lib/package.c b/lib/package.c index a5e347d..2246ef0 100644 --- a/lib/package.c +++ b/lib/package.c @@ -16,189 +16,6 @@ #include "rpmlead.h" #include "signature.h" -#if defined(ENABLE_V1_PACKAGES) -/* 0 = success */ -/* !0 = error */ -static int readOldHeader(FD_t fd, /*@out@*/Header * hdr, /*@unused@*/ /*@out@*/int * isSource) -{ - struct oldrpmHeader oldheader; - struct oldrpmHeaderSpec spec; - Header dbentry; - int_32 installTime = 0; - char ** fileList; - char ** fileMD5List; - char ** fileLinktoList; - int_32 * fileSizeList; - int_32 * fileUIDList; - int_32 * fileGIDList; - int_32 * fileMtimesList; - int_32 * fileFlagsList; - int_16 * fileModesList; - int_16 * fileRDevsList; - char * fileStatesList; - int i, j; - char ** unames, ** gnames; - - (void)Fseek(fd, 0, SEEK_SET); - - if (oldhdrReadFromStream(fd, &oldheader)) { - return 1; - } - - if (oldhdrParseSpec(&oldheader, &spec)) { - return 1; - } - - dbentry = headerNew(); - headerAddEntry(dbentry, RPMTAG_NAME, RPM_STRING_TYPE, oldheader.name, 1); - headerAddEntry(dbentry, RPMTAG_VERSION, RPM_STRING_TYPE, oldheader.version, 1); - headerAddEntry(dbentry, RPMTAG_RELEASE, RPM_STRING_TYPE, oldheader.release, 1); - headerAddEntry(dbentry, RPMTAG_DESCRIPTION, RPM_STRING_TYPE, - spec.description, 1); - headerAddEntry(dbentry, RPMTAG_BUILDTIME, RPM_INT32_TYPE, &spec.buildTime, 1); - headerAddEntry(dbentry, RPMTAG_BUILDHOST, RPM_STRING_TYPE, spec.buildHost, 1); - headerAddEntry(dbentry, RPMTAG_INSTALLTIME, RPM_INT32_TYPE, &installTime, 1); - headerAddEntry(dbentry, RPMTAG_DISTRIBUTION, RPM_STRING_TYPE, - spec.distribution, 1); - headerAddEntry(dbentry, RPMTAG_VENDOR, RPM_STRING_TYPE, spec.vendor, 1); - headerAddEntry(dbentry, RPMTAG_SIZE, RPM_INT32_TYPE, &oldheader.size, 1); - headerAddEntry(dbentry, RPMTAG_LICENSE, RPM_STRING_TYPE, spec.copyright, 1); - - if (oldheader.group) - headerAddEntry(dbentry, RPMTAG_GROUP, RPM_STRING_TYPE, oldheader.group, 1); - else - headerAddEntry(dbentry, RPMTAG_GROUP, RPM_STRING_TYPE, "Unknown", 1); - - if (spec.prein) - headerAddEntry(dbentry, RPMTAG_PREIN, RPM_STRING_TYPE, spec.prein, 1); - if (spec.preun) - headerAddEntry(dbentry, RPMTAG_PREUN, RPM_STRING_TYPE, spec.preun, 1); - if (spec.postin) - headerAddEntry(dbentry, RPMTAG_POSTIN, RPM_STRING_TYPE, spec.postin, 1); - if (spec.postun) - headerAddEntry(dbentry, RPMTAG_POSTUN, RPM_STRING_TYPE, spec.postun, 1); - - *hdr = dbentry; - - if (spec.fileCount) { - /* some packages have no file lists */ - - fileList = xmalloc(sizeof(char *) * spec.fileCount); - fileLinktoList = xmalloc(sizeof(char *) * spec.fileCount); - fileMD5List = xmalloc(sizeof(char *) * spec.fileCount); - fileSizeList = xmalloc(sizeof(int_32) * spec.fileCount); - fileUIDList = xmalloc(sizeof(int_32) * spec.fileCount); - fileGIDList = xmalloc(sizeof(int_32) * spec.fileCount); - fileMtimesList = xmalloc(sizeof(int_32) * spec.fileCount); - fileFlagsList = xmalloc(sizeof(int_32) * spec.fileCount); - fileModesList = xmalloc(sizeof(int_16) * spec.fileCount); - fileRDevsList = xmalloc(sizeof(int_16) * spec.fileCount); - fileStatesList = xmalloc(sizeof(char) * spec.fileCount); - unames = xmalloc(sizeof(char *) * spec.fileCount); - gnames = xmalloc(sizeof(char *) * spec.fileCount); - - /* We also need to contstruct a file owner/group list. We'll just - hope the numbers all map to something, those that don't will - get set as 'id%d'. Not perfect, but this should be - good enough. */ - - /* old packages were reverse sorted, new ones are forward sorted */ - j = spec.fileCount - 1; - for (i = 0; i < spec.fileCount; i++, j--) { - fileList[j] = spec.files[i].path; - fileMD5List[j] = spec.files[i].md5; - fileSizeList[j] = spec.files[i].size; - fileUIDList[j] = spec.files[i].uid; - fileGIDList[j] = spec.files[i].gid; - fileMtimesList[j] = spec.files[i].mtime; - fileModesList[j] = spec.files[i].mode; - fileRDevsList[j] = spec.files[i].rdev; - fileStatesList[j] = spec.files[i].state; - - if (spec.files[i].linkto) - fileLinktoList[j] = spec.files[i].linkto; - else - fileLinktoList[j] = ""; - - fileFlagsList[j] = 0; - if (spec.files[i].isdoc) - fileFlagsList[j] |= RPMFILE_DOC; - if (spec.files[i].isconf) - fileFlagsList[j] |= RPMFILE_CONFIG; - - unames[j] = uidToUname(fileUIDList[j]); - if (unames[j]) - unames[j] = xstrdup(unames[j]); - else { - unames[j] = xmalloc(20); - sprintf(unames[j], "uid%d", fileUIDList[j]); - } - - gnames[j] = gidToGname(fileGIDList[j]); - if (gnames[j]) - gnames[j] = xstrdup(gnames[j]); - else { - gnames[j] = xmalloc(20); - sprintf(gnames[j], "gid%d", fileGIDList[j]); - } - } - - headerAddEntry(*hdr, RPMTAG_OLDFILENAMES, RPM_STRING_ARRAY_TYPE, - fileList, spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILELINKTOS, RPM_STRING_ARRAY_TYPE, - fileLinktoList, spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILEMD5S, RPM_STRING_ARRAY_TYPE, - fileMD5List, spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILESIZES, RPM_INT32_TYPE, fileSizeList, - spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILEUIDS, RPM_INT32_TYPE, fileUIDList, - spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILEGIDS, RPM_INT32_TYPE, fileGIDList, - spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILEMTIMES, RPM_INT32_TYPE, - fileMtimesList, spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILEFLAGS, RPM_INT32_TYPE, - fileFlagsList, spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILEMODES, RPM_INT16_TYPE, - fileModesList, spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILERDEVS, RPM_INT16_TYPE, - fileRDevsList, spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILESTATES, RPM_INT8_TYPE, - fileStatesList, spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILEUSERNAME, RPM_STRING_ARRAY_TYPE, - unames, spec.fileCount); - headerAddEntry(*hdr, RPMTAG_FILEGROUPNAME, RPM_STRING_ARRAY_TYPE, - gnames, spec.fileCount); - - compressFilelist(*hdr); - - free(fileList); - free(fileLinktoList); - free(fileMD5List); - free(fileSizeList); - free(fileUIDList); - free(fileGIDList); - free(fileMtimesList); - free(fileFlagsList); - free(fileModesList); - free(fileRDevsList); - free(fileStatesList); - - for (i = 0; i < spec.fileCount; i++) { - free(unames[i]); - free(gnames[i]); - } - - free(unames); - free(gnames); - } - - oldhdrFree(&oldheader); - - return 0; -} -#endif /* ENABLE_V1_PACKAGES */ - /* 0 = success */ /* 1 = bad magic */ /* 2 = error */ @@ -232,37 +49,11 @@ static int readPackageHeaders(FD_t fd, /*@out@*/struct rpmlead * leadPtr, } switch (lead->major) { -#if defined(ENABLE_V1_PACKAGES) case 1: - rpmMessage(RPMMESS_DEBUG, _("package is a version one package!\n")); - - if (lead->type == RPMLEAD_SOURCE) { - struct oldrpmlead * oldLead = (struct oldrpmlead *) lead; - - rpmMessage(RPMMESS_DEBUG, _("old style source package -- " - "I'll do my best\n")); - oldLead->archiveOffset = ntohl(oldLead->archiveOffset); - rpmMessage(RPMMESS_DEBUG, _("archive offset is %d\n"), - oldLead->archiveOffset); - - (void)Fseek(fd, oldLead->archiveOffset, SEEK_SET); - - /* we can't put togeher a header for old format source packages, - there just isn't enough information there. We'll return - NULL */ - - *hdr = NULL; - } else { - rpmMessage(RPMMESS_DEBUG, _("old style binary package\n")); - readOldHeader(fd, hdr, &isSource); - arch = lead->archnum; - headerAddEntry(*hdr, RPMTAG_ARCH, RPM_INT8_TYPE, &arch, 1); - arch = 1; /* old versions of RPM only supported Linux */ - headerAddEntry(*hdr, RPMTAG_OS, RPM_INT8_TYPE, &arch, 1); - } - break; -#endif /* ENABLE_V1_PACKAGES */ - + rpmError(RPMERR_NEWPACKAGE, _("packaging version 1 is not" + "supported by this version of RPM")); + return 2; + /*@notreached@*/ break; case 2: case 3: case 4: @@ -319,8 +110,8 @@ static int readPackageHeaders(FD_t fd, /*@out@*/struct rpmlead * leadPtr, break; default: - rpmError(RPMERR_NEWPACKAGE, _("only packages with major numbers <= 3 " - "are supported by this version of RPM")); + rpmError(RPMERR_NEWPACKAGE, _("only packaging with major numbers <= 4 " + "is supported by this version of RPM")); return 2; /*@notreached@*/ break; } diff --git a/lib/problems.c b/lib/problems.c index 22baf50..c989688 100644 --- a/lib/problems.c +++ b/lib/problems.c @@ -9,7 +9,7 @@ /*@access rpmProblem@*/ /* XXX FIXME: merge into problems */ -/* XXX used in verify.c */ +/* XXX used in verify.c rpmlibprov.c */ void printDepFlags(FILE * fp, const char * version, int flags) { if (flags) diff --git a/lib/rpmlib.h b/lib/rpmlib.h index b9b1a64..8ead72a 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -190,10 +190,8 @@ extern const struct headerSprintfExtension rpmHeaderFormats[]; #define RPMTAG_PAYLOADCOMPRESSOR 1125 #define RPMTAG_PAYLOADFLAGS 1126 #define RPMTAG_MULTILIBS 1127 -#define RPMTAG_PRETRANSACTION 1128 -#define RPMTAG_POSTTRANSACTION 1129 /*unused */ -#define RPMTAG_FIRSTFREE_TAG 1130 /* internal */ +#define RPMTAG_FIRSTFREE_TAG 1128 /* internal */ #define RPMTAG_EXTERNAL_TAG 1000000 #define RPMFILE_STATE_NORMAL 0 @@ -529,10 +527,6 @@ int rpmVerifyFile(const char * root, Header h, int filenum, */ int rpmVerifyScript(const char * root, Header h, FD_t err); -/** - */ -int rpmSyscall(const char *cmd, int noexec); - /* Transaction sets are inherently unordered! RPM may reorder transaction sets to reduce errors. In general, installs/upgrades are done before strict removals, and prerequisite ordering is done on installs/upgrades. */ @@ -627,6 +621,9 @@ int rpmRangesOverlap(const char *AName, const char *AEVR, int AFlags, int rpmCheckRpmlibProvides(const char * keyName, const char * keyEVR, int keyFlags); +/** + */ +void rpmShowRpmlibProvides(FILE * fp); typedef enum rpmProblemType_e { RPMPROB_BADARCH, RPMPROB_BADOS, diff --git a/lib/rpmlibprov.c b/lib/rpmlibprov.c index 8bc6054..11e8d5a 100644 --- a/lib/rpmlibprov.c +++ b/lib/rpmlibprov.c @@ -6,15 +6,34 @@ static struct rpmlibProvides { const char * featureName; const char * featureEVR; int featureFlags; + const char * featureDescription; } rpmlibProvides[] = { - { "rpmlib(VersionedDependencies)", "3.0.3-1", RPMSENSE_EQUAL }, - { "rpmlib(CompressedFileNames)", "3.0.4-1", RPMSENSE_EQUAL }, - { "rpmlib(PayloadIsBzip2)", "3.0.5-1", RPMSENSE_EQUAL }, - { "rpmlib(PayloadFilesHavePrefix)", "4.0-1", RPMSENSE_EQUAL }, - { "rpmlib(PreTransactionSyscalls)", "4.0-1", RPMSENSE_EQUAL }, + { "rpmlib(VersionedDependencies)", "3.0.3-1", RPMSENSE_EQUAL, + "PreReq:, Provides:, and Obsoletes: dependencies support versions." }, + { "rpmlib(CompressedFileNames)", "3.0.4-1", RPMSENSE_EQUAL, + "file names stored as (dirName,BaseName,dirIndex) tuple, not as path."}, + { "rpmlib(PayloadIsBzip2)", "3.0.5-1", RPMSENSE_EQUAL, + "package payload compressed using bzip2." }, + { "rpmlib(PayloadFilesHavePrefix)", "4.0-1", RPMSENSE_EQUAL, + "package payload files have \"./\" prefix." }, + { "rpmlib(ExplicitPackageProvide)", "4.0-1", RPMSENSE_EQUAL, + "package name-version-release not implicitly provided." }, { NULL, NULL, 0 } }; +void rpmShowRpmlibProvides(FILE * fp) +{ + const struct rpmlibProvides * rlp; + + for (rlp = rpmlibProvides; rlp->featureName != NULL; rlp++) { + fprintf(fp, " %s", rlp->featureName); + if (rlp->featureFlags) + printDepFlags(fp, rlp->featureEVR, rlp->featureFlags); + fprintf(fp, "\n"); + fprintf(fp, "\t%s\n", rlp->featureDescription); + } +} + int rpmCheckRpmlibProvides(const char * keyName, const char * keyEVR, int keyFlags) { diff --git a/lib/rpmrc.c b/lib/rpmrc.c index d08f1b7..dcee733 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -1356,56 +1356,61 @@ void rpmFreeRpmrc(void) return; } -int rpmShowRC(FILE *f) +int rpmShowRC(FILE *fp) { struct rpmOption *opt; int i; struct machEquivTable * equivTable; /* the caller may set the build arch which should be printed here */ - fprintf(f, "ARCHITECTURE AND OS:\n"); - fprintf(f, "build arch : %s\n", current[ARCH]); + fprintf(fp, "ARCHITECTURE AND OS:\n"); + fprintf(fp, "build arch : %s\n", current[ARCH]); - fprintf(f, "compatible build archs:"); + fprintf(fp, "compatible build archs:"); equivTable = &tables[RPM_MACHTABLE_BUILDARCH].equiv; for (i = 0; i < equivTable->count; i++) - fprintf(f," %s", equivTable->list[i].name); - fprintf(f, "\n"); + fprintf(fp," %s", equivTable->list[i].name); + fprintf(fp, "\n"); - fprintf(f, "build os : %s\n", current[OS]); + fprintf(fp, "build os : %s\n", current[OS]); - fprintf(f, "compatible build os's :"); + fprintf(fp, "compatible build os's :"); equivTable = &tables[RPM_MACHTABLE_BUILDOS].equiv; for (i = 0; i < equivTable->count; i++) - fprintf(f," %s", equivTable->list[i].name); - fprintf(f, "\n"); + fprintf(fp," %s", equivTable->list[i].name); + fprintf(fp, "\n"); rpmSetTables(RPM_MACHTABLE_INSTARCH, RPM_MACHTABLE_INSTOS); rpmSetMachine(NULL, NULL); /* XXX WTFO? Why bother? */ - fprintf(f, "install arch : %s\n", current[ARCH]); - fprintf(f, "install os : %s\n", current[OS]); + fprintf(fp, "install arch : %s\n", current[ARCH]); + fprintf(fp, "install os : %s\n", current[OS]); - fprintf(f, "compatible archs :"); + fprintf(fp, "compatible archs :"); equivTable = &tables[RPM_MACHTABLE_INSTARCH].equiv; for (i = 0; i < equivTable->count; i++) - fprintf(f," %s", equivTable->list[i].name); - fprintf(f, "\n"); + fprintf(fp," %s", equivTable->list[i].name); + fprintf(fp, "\n"); - fprintf(f, "compatible os's :"); + fprintf(fp, "compatible os's :"); equivTable = &tables[RPM_MACHTABLE_INSTOS].equiv; for (i = 0; i < equivTable->count; i++) - fprintf(f," %s", equivTable->list[i].name); - fprintf(f, "\n"); + fprintf(fp," %s", equivTable->list[i].name); + fprintf(fp, "\n"); - fprintf(f, "\nRPMRC VALUES:\n"); + fprintf(fp, "\nRPMRC VALUES:\n"); for (i = 0, opt = optionTable; i < optionTableSize; i++, opt++) { const char *s = rpmGetVar(opt->var); if (s != NULL || rpmGetVerbosity() < RPMMESS_NORMAL) - fprintf(f, "%-21s : %s\n", opt->name, s ? s : "(not set)"); + fprintf(fp, "%-21s : %s\n", opt->name, s ? s : "(not set)"); } + fprintf(fp, "\n"); - rpmDumpMacroTable(NULL, f); + fprintf(fp, "Features supported by rpmlib:\n"); + rpmShowRpmlibProvides(stdout); + fprintf(fp, "\n"); + + rpmDumpMacroTable(NULL, fp); return 0; } diff --git a/lib/transaction.c b/lib/transaction.c index 5d4688d..7e72fab 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -1371,35 +1371,6 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify, i = ts->order[oc].u.addedIndex; alp = ts->addedPackages.list + ts->order[oc].u.addedIndex; - if (!(transFlags & RPMTRANS_FLAG_TEST) && - headerGetEntry(alp->h, RPMTAG_PRETRANSACTION, NULL, - (void **) &preTrans, &preTransCount)) { - - chdir("/"); - /*@-unrecog@*/ chroot(ts->rootDir); /*@=unrecog@*/ - - for (j = 0; j < preTransCount; j++) { - rpmMessage(RPMMESS_DEBUG, - _("executing pre-transaction syscall: \"%s\"\n"), - preTrans[j]); - rc = rpmSyscall(preTrans[j], 0); -#if 1 - if (rc) /* HACK HACK HACK */ - break; -#else - if (rc != 0) - psAppend(probs, RPMPROB_BADPRETRANS, alp->key, alp->h, - preTrans[j], NULL, rc); -#endif - } - xfree(preTrans); - preTrans = NULL; - - chroot("."); - chdir(ts->currDir); - - } - if (!headerGetEntryMinMemory(alp->h, RPMTAG_BASENAMES, NULL, NULL, &fi->fc)) { fi->h = headerLink(alp->h); diff --git a/perl/Makefile.in b/perl/Makefile.in index 22d8824..34c649d 100644 --- a/perl/Makefile.in +++ b/perl/Makefile.in @@ -68,7 +68,6 @@ target_triplet = @target@ AR = @AR@ AS = @AS@ AWK = @AWK@ -BUILD_RPMCONVERT = @BUILD_RPMCONVERT@ BUILD_RPMNLSTOOLS = @BUILD_RPMNLSTOOLS@ BZIP2BIN = @BZIP2BIN@ CATALOGS = @CATALOGS@ diff --git a/po/cs.po b/po/cs.po index f125039..1a0a626 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: 1998-10-10 10:10+0200\n" "Last-Translator: Pavel Makovec \n" "Language-Team: Czech \n" @@ -2140,32 +2140,27 @@ msgstr "neplatn msgid "line %d: Bad BuildArchitecture format: %s" msgstr "chybí architektura pro %s u %s:%d" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "neplatné èíslo balíèku: %s\n" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, fuzzy, c-format msgid "Internal error: Bogus tag %d" msgstr "interní chyba (chyba rpm?): " -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Volby pro specifikaci balíèku:" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, fuzzy, c-format msgid "line %d: Unknown tag: %s" msgstr "Neznámý systém: %s\n" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2334,143 +2329,128 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "neplatné èíslo balíèku: %s\n" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "nelze odstranit %s: %s\n" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "chyba: " -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 #, fuzzy msgid "Unknown file type" msgstr "Neznámý systém: %s\n" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 #, fuzzy msgid "Internal error" msgstr "interní chyba (chyba rpm?): " -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 #, fuzzy msgid " failed - " msgstr "chyba pgp" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, fuzzy, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "¾ádný balíèek nevlastní soubor %s\n" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "¾ádný balíèek nevlastní soubor %s\n" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, fuzzy, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "¾ádný balíèek nevlastní soubor %s\n" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, 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:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "polo¾ka 'vy¾aduje' balíèku %s není splnìna: %s\n" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "balíèek %s koliduje: %s\n" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "smyèka v øetìzu podmínek: %s" @@ -2788,7 +2768,7 @@ msgstr "bal msgid "renaming %s to %s\n" msgstr "Probíhá získávání %s jako %s\n" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s nelze pøejmenovat na %s: %s" @@ -2797,32 +2777,32 @@ msgstr "%s nelze p msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, 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:957 +#: lib/install.c:950 #, 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:962 +#: lib/install.c:955 #, fuzzy msgid "running preinstall script (if any)\n" msgstr "spou¹tí se pøípadný poinstalaèní skript\n" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "spou¹tí se pøípadný poinstalaèní skript\n" @@ -2837,26 +2817,16 @@ msgstr "chyba p msgid "bad file state: %s" msgstr "nelze provést statistiku %s: %s" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "balíèek je balíèkem verze jedna!\n" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "zdrojový balíèek starého typu -- snaha bude\n" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "offset archivu je %d\n" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "binární balíèek starého typu\n" +#: lib/package.c:53 +#, fuzzy +msgid "packaging version 1 is notsupported by this version of RPM" +msgstr "" +"tato verze RPM podporuje jen balíèky, které mají hlavní (major) èísla <= 3" -#: lib/package.c:322 +#: lib/package.c:113 +#, fuzzy msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" "tato verze RPM podporuje jen balíèky, které mají hlavní (major) èísla <= 3" @@ -3892,11 +3862,6 @@ msgstr "Prob msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4155,6 +4120,30 @@ msgid "failed to create %s: %s\n" msgstr "%s nelze vytvoøit\n" #, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "neplatné èíslo balíèku: %s\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (added package)\n" +#~ msgstr "¾ádný balíèek nevlastní soubor %s\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (db packages)\n" +#~ msgstr "¾ádný balíèek nevlastní soubor %s\n" + +#~ msgid "package is a version one package!\n" +#~ msgstr "balíèek je balíèkem verze jedna!\n" + +#~ msgid "old style source package -- I'll do my best\n" +#~ msgstr "zdrojový balíèek starého typu -- snaha bude\n" + +#~ msgid "archive offset is %d\n" +#~ msgstr "offset archivu je %d\n" + +#~ msgid "old style binary package\n" +#~ msgstr "binární balíèek starého typu\n" + +#, fuzzy #~ msgid "" #~ " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " #~ "]" diff --git a/po/da.po b/po/da.po index 6d12ff0..cb5846b 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2000-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" @@ -1990,32 +1990,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2182,140 +2177,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2631,7 +2611,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2640,30 +2620,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2677,26 +2657,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3691,11 +3658,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/de.po b/po/de.po index 4fd5a70..d17ffc8 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -2226,32 +2226,27 @@ msgstr "ung msgid "line %d: Bad BuildArchitecture format: %s" msgstr "fehlende Architektur für %s bei %s:%d" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "ungültige Paket-Nummer: %s\n" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Optionen der Paketauswahl:" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2426,143 +2421,128 @@ msgid "line %d: Bad %s number: %s\n" msgstr "ungültige Paket-Nummer: %s\n" # , c-format -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "Fehler: " -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 #, fuzzy msgid "Unknown file type" msgstr "(unbekannter Typ)" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 #, fuzzy msgid "Internal error" msgstr "Fataler Fehler: " -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 #, fuzzy msgid " failed - " msgstr "pgp fehlgeschlagen" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, fuzzy, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "die Datei »%s« gehört zu keinem Paket\n" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, fuzzy, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "die Datei »%s« gehört zu keinem Paket\n" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, 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:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2889,7 +2869,7 @@ msgstr "Anfrage nach Paket, das die Datei besitzt" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "umbennen von %s nach %s fehlgeschlagen: %s" @@ -2899,30 +2879,30 @@ msgid "source package expected, binary found" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/install.c:897 +#: lib/install.c:890 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2937,26 +2917,16 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" msgid "bad file state: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" +#: lib/package.c:53 +#, fuzzy +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" +"Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt" -#: lib/package.c:322 +#: lib/package.c:113 +#, fuzzy msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt" @@ -4017,11 +3987,6 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4282,6 +4247,18 @@ msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" #, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "ungültige Paket-Nummer: %s\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (added package)\n" +#~ msgstr "die Datei »%s« gehört zu keinem Paket\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (db packages)\n" +#~ msgstr "die Datei »%s« gehört zu keinem Paket\n" + +#, fuzzy #~ msgid "" #~ " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " #~ "]" diff --git a/po/es.po b/po/es.po index b0db1ec..35f0750 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1975,32 +1975,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2167,140 +2162,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2616,7 +2596,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2625,30 +2605,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2662,26 +2642,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3676,11 +3643,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/fi.po b/po/fi.po index 82ad633..0da3fc5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -2172,32 +2172,27 @@ msgstr "virheellinen paketin numero: %s\n" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "%s:n puuttuva arkkitehtuuri %s:%d" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "virheellinen paketin numero: %s\n" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Paketin määrittelyparametrit:" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2366,143 +2361,128 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "En voi lukea %s: %s." -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "virhe: " -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 #, fuzzy msgid "Unknown file type" msgstr "(tuntematon tyyppi)" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 #, fuzzy msgid "Internal error" msgstr "vakava virhe: " -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 #, fuzzy msgid " failed - " msgstr "pgp epäonnistui" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, fuzzy, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "tiedostoa %s ei omista mikään paketti\n" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, fuzzy, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "tiedostoa %s ei omista mikään paketti\n" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, 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:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "paketti %s ei ole %s:ssä" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "silmukka edellytysten ketjussa: %s" @@ -2822,7 +2802,7 @@ msgstr "kysy pakettia, jonka omistuksessa on" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s" @@ -2831,30 +2811,30 @@ msgstr "%s:n nime msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, 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:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2868,26 +2848,16 @@ msgstr "virhe luotaessa hakemistoa %s: %s" msgid "bad file state: %s" msgstr "en voinut avata %s: %s" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" +#: lib/package.c:53 +#, fuzzy +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" +"tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja" -#: lib/package.c:322 +#: lib/package.c:113 +#, fuzzy msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja" @@ -3930,11 +3900,6 @@ msgstr "virhe luotaessa hakemistoa %s: %s" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4193,6 +4158,18 @@ msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" #, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "virheellinen paketin numero: %s\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (added package)\n" +#~ msgstr "tiedostoa %s ei omista mikään paketti\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (db packages)\n" +#~ msgstr "tiedostoa %s ei omista mikään paketti\n" + +#, fuzzy #~ msgid "" #~ " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " #~ "]" diff --git a/po/fr.po b/po/fr.po index ac7c65b..695e64d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2000-07-13 19:28-0400\n" +msgstr "POT-Creation-Date: 2000-07-15 10:39-0400\n" #: build.c:25 lib/rpminstall.c:451 #, c-format @@ -2167,32 +2167,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "impossible d'ouvrir: %s\n" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Options de spécification de package:" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2361,141 +2356,126 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 #, fuzzy msgid " failed - " msgstr "La construction a échoué.\n" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "aucun package n'a été spécifié pour l'installation" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2815,7 +2795,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2824,30 +2804,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, 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:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2861,26 +2841,13 @@ msgstr "" msgid "bad file state: %s" msgstr "impossible d'ouvrir: %s\n" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3917,11 +3884,6 @@ msgstr "impossible d'ouvrir: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4170,6 +4132,10 @@ msgid "failed to create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "impossible d'ouvrir: %s\n" + +#, fuzzy #~ msgid " [--sign] [--nobuild] [--timecheck ] ]" #~ msgstr " qui matchent " diff --git a/po/gl.po b/po/gl.po index b0db1ec..35f0750 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1975,32 +1975,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2167,140 +2162,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2616,7 +2596,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2625,30 +2605,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2662,26 +2642,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3676,11 +3643,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/hu.po b/po/hu.po index b0db1ec..35f0750 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1975,32 +1975,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2167,140 +2162,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2616,7 +2596,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2625,30 +2605,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2662,26 +2642,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3676,11 +3643,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/id.po b/po/id.po index b0db1ec..35f0750 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1975,32 +1975,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2167,140 +2162,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2616,7 +2596,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2625,30 +2605,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2662,26 +2642,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3676,11 +3643,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/is.po b/po/is.po index 0128994..f5618d4 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: 2000-06-16 02:20+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -1970,32 +1970,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2162,140 +2157,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2611,7 +2591,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2620,30 +2600,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2657,26 +2637,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3671,11 +3638,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/it.po b/po/it.po index b0db1ec..35f0750 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1975,32 +1975,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2167,140 +2162,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2616,7 +2596,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2625,30 +2605,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2662,26 +2642,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3676,11 +3643,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/ja.po b/po/ja.po index ddba090..85be298 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-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.93 2000/07/13 23:30:42 jbj Exp $ +# $Id: ja.po,v 1.94 2000/07/15 14:53:57 jbj Exp $ #: rpm.c:178 rpmqv.c:257 #, c-format msgid "rpm: %s\n" @@ -2111,32 +2111,27 @@ msgstr "%d msgid "line %d: Bad BuildArchitecture format: %s" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê BuildArchitecture ¥Õ¥©¡¼¥Þ¥Ã¥È: %s" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "%d ¹ÔÌÜ: ÉÔ´°Á´¤Ê·Á¤Î¥¿¥°: %s" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "ÆâÉô¥¨¥é¡¼: ¤Ë¤»¤Î¥¿¥° %d" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "ÉÔÀµ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤Î»ØÄê: %s" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹: %s" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "%d ¹ÔÌÜ: ÉÔÌÀ¤Ê¥¿¥°: %s" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ï BuildRoot ¤ò»ÈÍѤǤ­¤Þ¤»¤ó" @@ -2306,59 +2301,59 @@ msgstr "%d msgid "line %d: Bad %s number: %s\n" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %s ÈÖ¹æ: %s\n" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, fuzzy, c-format msgid "can't unlink %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "(¥¨¥é¡¼ 0x%x)" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "ÉÔÀµ¤Ê¥Þ¥¸¥Ã¥¯" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "ÉÔÀµ¤Ê/ÉÔ²ÄÆɤʥإåÀ" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "¥Ø¥Ã¥À¥µ¥¤¥º¤¬Â礭¤¹¤®¤Þ¤¹" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 #, fuzzy msgid "Unknown file type" msgstr "ÉÔÌÀ¤Ê¥Õ¥¡¥¤¥ë¥¿¥¤¥×" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "¥Ï¡¼¥É¥ê¥ó¥¯¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 #, fuzzy msgid "Internal error" msgstr "ÆâÉô¥¨¥é¡¼" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 #, fuzzy msgid " failed - " msgstr "¼ºÇÔ - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2367,84 +2362,69 @@ msgstr "" "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, fuzzy, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:885 -#, fuzzy, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, fuzzy, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:985 +#: lib/depends.c:951 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:1032 -#, fuzzy, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "prerequisite ¥Á¥§¡¼¥ó¤Î¥ë¡¼¥×: %s" @@ -2769,7 +2749,7 @@ msgstr " msgid "renaming %s to %s\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ: %s" @@ -2778,30 +2758,30 @@ msgstr "%s msgid "source package expected, binary found" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "--test ¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤òÃæ»ß¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "¥×¥ê¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤¹" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Þ¤¹" -#: lib/install.c:1112 +#: lib/install.c:1105 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" @@ -2816,26 +2796,16 @@ msgstr " msgid "bad file state: %s" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï°ì¤Ä¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸!\n" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "¸Å¤¤¥¹¥¿¥¤¥ë¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸ -- ¥Ù¥¹¥È¤ò¿Ô¤¯¤·¤Þ¤¹\n" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "¥¢¡¼¥«¥¤¥Ö¥ª¥Õ¥»¥Ã¥È¤Ï %d\n" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "¸Å¤¤¥¹¥¿¥¤¥ë¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸\n" +#: lib/package.c:53 +#, fuzzy +msgid "packaging version 1 is notsupported by this version of RPM" +msgstr "" +"¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/package.c:322 +#: lib/package.c:113 +#, fuzzy msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹" @@ -3884,11 +3854,6 @@ msgstr " msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4151,6 +4116,30 @@ msgid "failed to create %s: %s\n" msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" #, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "%d ¹ÔÌÜ: ÉÔ´°Á´¤Ê·Á¤Î¥¿¥°: %s" + +#, fuzzy +#~ msgid "%s: %-45s YES (added package)\n" +#~ msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (db packages)\n" +#~ msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" + +#~ msgid "package is a version one package!\n" +#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï°ì¤Ä¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸!\n" + +#~ msgid "old style source package -- I'll do my best\n" +#~ msgstr "¸Å¤¤¥¹¥¿¥¤¥ë¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸ -- ¥Ù¥¹¥È¤ò¿Ô¤¯¤·¤Þ¤¹\n" + +#~ msgid "archive offset is %d\n" +#~ msgstr "¥¢¡¼¥«¥¤¥Ö¥ª¥Õ¥»¥Ã¥È¤Ï %d\n" + +#~ msgid "old style binary package\n" +#~ msgstr "¸Å¤¤¥¹¥¿¥¤¥ë¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸\n" + +#, fuzzy #~ msgid "%s: %-45s YES (rpmlib version)\n" #~ msgstr "%s: %s ¤Ï rpmlib ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" diff --git a/po/ko.po b/po/ko.po index b0db1ec..35f0750 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1975,32 +1975,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2167,140 +2162,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2616,7 +2596,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2625,30 +2605,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2662,26 +2642,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3676,11 +3643,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/no.po b/po/no.po index 16b316a..9f80af6 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: 2000-06-22 21:59+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -2000,32 +2000,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2192,140 +2187,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2641,7 +2621,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2650,30 +2630,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2687,26 +2667,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3701,11 +3668,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/pl.po b/po/pl.po index 0c9a49b..b609771 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -2119,32 +2119,27 @@ msgstr "linia %d: pole Epoch/Serial musi by msgid "line %d: Bad BuildArchitecture format: %s" msgstr "linia %d: B³êdny format wpisu BuildArchitecture: %s" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "linia %d: Niepoprawna forma etykiety: %s" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "B³±d wewnêtrzny: Fa³szywa etykieta %d" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "B³êdna specyfikacja pakietu: $s" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "Pakiet ju¿ istnieje: %s" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "linia %d: Nieznana etykieta: %s" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "W pliku spec nie mo¿na u¿ywaæ wpisów BuildRoot" @@ -2312,140 +2307,125 @@ msgstr "linia %d: b msgid "line %d: Bad %s number: %s\n" msgstr "linia %d: B³êdny numer %s: %s\n" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "nie mo¿na zmieniæ nazwy %s na %s: %s\n" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "(b³±d 0x%x)" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "B³êdny magic" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "B³êdny/nieczytelny nag³ówek" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "Rozmiar nag³ówka jest zbyt du¿y" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "Nieznany typ pliku" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "Brak twardego dowi±zania" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "B³±d wewnêtrzny" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr " nie powiod³o siê -" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, fuzzy, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, fuzzy, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, 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:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakiet %s jest w konflikcie: %s\n" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2761,7 +2741,7 @@ msgstr "pakiet msgid "renaming %s to %s\n" msgstr "zmiana nazwy %s na %s\n" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 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" @@ -2770,30 +2750,30 @@ msgstr "zmiana nazwy z %s na %s nie powiod msgid "source package expected, binary found" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "pakiet: %s-%s-%s test plików = %d\n" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "przebieg testowy - instalacja zatrzymana\n" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "uruchamianie skryptu preinstall (je¶li istnieje)\n" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "ostrze¿enie: %s utworzony jako %s" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "ostrze¿enie: %s zapisany jako %s" -#: lib/install.c:1112 +#: lib/install.c:1105 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" @@ -2808,26 +2788,16 @@ msgstr "b msgid "bad file state: %s" msgstr "b³êdny status pliku: %s" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "ten pakiet jest pakietem w wersji jeden!\n" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "stary styl pakietu ¼ród³owego -- Zrobiê co w mojej mocy\n" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "ofsetem archiwum jest %d\n" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "stary styl pakietu binarnego\n" +#: lib/package.c:53 +#, fuzzy +msgid "packaging version 1 is notsupported by this version of RPM" +msgstr "" +"tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a" -#: lib/package.c:322 +#: lib/package.c:113 +#, fuzzy msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a" @@ -3846,11 +3816,6 @@ msgstr "przesuwanie %s do %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4102,6 +4067,30 @@ msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" #, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "linia %d: Niepoprawna forma etykiety: %s" + +#, fuzzy +#~ msgid "%s: %-45s YES (added package)\n" +#~ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (db packages)\n" +#~ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" + +#~ msgid "package is a version one package!\n" +#~ msgstr "ten pakiet jest pakietem w wersji jeden!\n" + +#~ msgid "old style source package -- I'll do my best\n" +#~ msgstr "stary styl pakietu ¼ród³owego -- Zrobiê co w mojej mocy\n" + +#~ msgid "archive offset is %d\n" +#~ msgstr "ofsetem archiwum jest %d\n" + +#~ msgid "old style binary package\n" +#~ msgstr "stary styl pakietu binarnego\n" + +#, fuzzy #~ msgid "" #~ " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " #~ "]" diff --git a/po/pt.po b/po/pt.po index b0db1ec..35f0750 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1975,32 +1975,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2167,140 +2162,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2616,7 +2596,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2625,30 +2605,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2662,26 +2642,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3676,11 +3643,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9242342..95d9eae 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-07-13 19:28-0400\n" +msgstr "POT-Creation-Date: 2000-07-15 10:39-0400\n" #: build.c:25 lib/rpminstall.c:451 #, c-format @@ -2227,33 +2227,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -# , c-format -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "Não consegui abrir: %s\n" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Opcões para especificação de pacotes:" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2429,141 +2423,126 @@ msgid "line %d: Bad %s number: %s\n" msgstr "" # , c-format -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "Não consegui ler o arquivo spec de %s\n" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 #, fuzzy msgid " failed - " msgstr "Construção falhou.\n" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "não foi passado pacote para instalação" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "não foi passado pacote para desinstalação" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2890,7 +2869,7 @@ msgstr "pesquise o pacote ao qual pertence" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2899,30 +2878,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, fuzzy, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "não foi passado pacote para instalação" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2937,26 +2916,13 @@ msgstr "" msgid "bad file state: %s" msgstr "Não consegui abrir: %s\n" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -4043,11 +4009,6 @@ msgstr "N msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4298,6 +4259,11 @@ msgstr "" msgid "failed to create %s: %s\n" msgstr "Não consegui abrir o pipe tar: %s\n" +# , c-format +#, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "Não consegui abrir: %s\n" + #, fuzzy #~ msgid "" #~ " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " diff --git a/po/ro.po b/po/ro.po index d36f215..f9c943e 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -1970,32 +1970,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2162,140 +2157,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2611,7 +2591,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2620,30 +2600,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2657,26 +2637,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3671,11 +3638,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/rpm.pot b/po/rpm.pot index b0db1ec..35f0750 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1975,32 +1975,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2167,140 +2162,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2616,7 +2596,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2625,30 +2605,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2662,26 +2642,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3676,11 +3643,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/po/ru.po b/po/ru.po index 4f95fc4..c2289bc 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" @@ -2124,32 +2124,27 @@ msgstr " msgid "line %d: Bad BuildArchitecture format: %s" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ BuildArchitecture: %s" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÔÜÇ: %s" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: \"ìÅ×ÙÊ\" ÔÜÇ %d" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "îÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ÐÁËÅÔÁ: %s" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "ðÁËÅÔ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ: %s" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "ÓÔÒÏËÁ %d: îÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ: %s" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "æÁÊÌ spec ÎÅ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ BuildRoot" @@ -2316,140 +2311,125 @@ msgstr " msgid "line %d: Bad %s number: %s\n" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ÞÉÓÌÏ %s: %s\n" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÐÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %s\n" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÕÄÁÌÉÔØ %s: %s\n" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "(ÏÛÉÂËÁ 0x%x)" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "îÅ×ÅÒÎÙÊ magic" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "îÅ×ÅÒÎÙÊ/ÎÅÞÉÔÁÅÍÙÊ ÚÁÇÏÌÏ×ÏË" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "úÁÇÏÌÏ×ÏË ÓÌÉÛËÏÍ ×ÅÌÉË" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÆÁÊÌÁ" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÖÅÓÔËÁÑ ÓÓÙÌËÁ" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, fuzzy, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, fuzzy, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅÐÏÞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s" @@ -2765,7 +2745,7 @@ msgstr " msgid "renaming %s to %s\n" msgstr "ÐÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "ÏÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ %s × %s: %s" @@ -2774,30 +2754,30 @@ msgstr " msgid "source package expected, binary found" msgstr "ÏÖÉÄÁÌÓÑ ÉÓÈÏÄÎÙÊ ÐÁËÅÔ, ÎÁÊÄÅÎ ÂÉÎÁÒÎÙÊ" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "ÐÁËÅÔ: %s-%s-%s ÆÁÊÌÏ×; test = %d\n" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "ÏÓÔÁÎÁ×ÌÉ×ÁÀ ÕÓÔÁÎÏ×ËÕ, Ô.Ë. ÍÙ ÉÓÐÏÌÎÑÅÍ --test\n" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "ÉÓÐÏÌÎÑÀ ÓËÒÉÐÔ preinstall (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÓÏÚÄÁÎ ËÁË %s" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÓÏÈÒÁÎÅÎ ËÁË %s" -#: lib/install.c:1112 +#: lib/install.c:1105 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "ÉÓÐÏÌÎÑÀ ÓËÒÉÐÔ postinstall (ÅÓÌÉ ÅÓÔØ)\n" @@ -2812,26 +2792,15 @@ msgstr " msgid "bad file state: %s" msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ: %s" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "ÐÁËÅÔ - ÐÁËÅÔ RPM ×ÅÒÓÉÉ 1 !\n" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÓÔÁÒÏÇÏ ÓÔÉÌÑ -- ÓÄÅÌÁÀ ÞÔÏ ÓÍÏÇÕ\n" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "ÓÍÅÝÅÎÉÅ × ÁÒÈÉ×Å %d\n" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "ÂÉÎÁÒÎÙÊ ÐÁËÅÔ ÓÔÁÒÏÇÏ ÓÔÉÌÑ\n" +#: lib/package.c:53 +#, fuzzy +msgid "packaging version 1 is notsupported by this version of RPM" +msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 3" -#: lib/package.c:322 +#: lib/package.c:113 +#, fuzzy msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 3" #: lib/poptBT.c:82 @@ -3850,11 +3819,6 @@ msgstr " msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4102,6 +4066,30 @@ msgid "failed to create %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s\n" #, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÔÜÇ: %s" + +#, fuzzy +#~ msgid "%s: %-45s YES (added package)\n" +#~ msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (db packages)\n" +#~ msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" + +#~ msgid "package is a version one package!\n" +#~ msgstr "ÐÁËÅÔ - ÐÁËÅÔ RPM ×ÅÒÓÉÉ 1 !\n" + +#~ msgid "old style source package -- I'll do my best\n" +#~ msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÓÔÁÒÏÇÏ ÓÔÉÌÑ -- ÓÄÅÌÁÀ ÞÔÏ ÓÍÏÇÕ\n" + +#~ msgid "archive offset is %d\n" +#~ msgstr "ÓÍÅÝÅÎÉÅ × ÁÒÈÉ×Å %d\n" + +#~ msgid "old style binary package\n" +#~ msgstr "ÂÉÎÁÒÎÙÊ ÐÁËÅÔ ÓÔÁÒÏÇÏ ÓÔÉÌÑ\n" + +#, fuzzy #~ msgid "" #~ " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " #~ "]" diff --git a/po/sk.po b/po/sk.po index b097231..692cdd9 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -2127,32 +2127,27 @@ msgstr "riadok %d: Epoch/Serial pole mus msgid "line %d: Bad BuildArchitecture format: %s" msgstr "riadok %d: Chybný formát BuildArchitecture: %s" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "riadok %d: Znetvorený popis: %s" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "Interná chyba: Èudný popis %d " -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "Chybná ¹pecifikácia balíka: %s" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "Balík u¾ existuje: %s" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "riadok %d: Neznámy popis: %s" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "Spec súbor nemô¾e pou¾i» BuildRoot" @@ -2319,140 +2314,125 @@ msgstr "riadok %d: Chybn msgid "line %d: Bad %s number: %s\n" msgstr "riadok %d: Chybné %s èíslo: %s\n" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "premenovanie %s na %s zlyhalo: %s\n" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "(chyba 0x%x)" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "Chybné magické èíslo" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "Chybná/neèitateµná hlavièka" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "Priveµká hlavièka" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "Neznámy typ súboru" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "Interná chyba" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr " zlyhalo - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, fuzzy, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, fuzzy, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, 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:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "balík %s koliduje: %s\n" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "sluèka v re»azi po¾iadaviek: %s" @@ -2768,7 +2748,7 @@ msgstr "zdrojov msgid "renaming %s to %s\n" msgstr "premenováva sa %s na %s\n" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "premenovanie %s na %s zlyhalo: %s" @@ -2777,30 +2757,30 @@ msgstr "premenovanie %s na %s zlyhalo: %s" msgid "source package expected, binary found" msgstr "oèakávaný zdrojový balík, nájdený binárny" -#: lib/install.c:897 +#: lib/install.c:890 #, 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:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "in¹talácia zastavená kvôli re¾imu --test\n" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "vykonávajú sa predin¹talaèné skripty (ak existujú)\n" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "varovanie: %s vytvorené ako %s" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "varovanie: %s uchovaný ako %s" -#: lib/install.c:1112 +#: lib/install.c:1105 #, fuzzy msgid "running postinstall scripts (if any)\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" @@ -2815,26 +2795,15 @@ msgstr "chyba pri vytv msgid "bad file state: %s" msgstr "chybný stav súboru: %s" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "balík je verzie jedna!\n" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "zdrojový balík v starom ¹týle - urobím, èo sa dá\n" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "posunutie v archíve je %d\n" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "binárny balík v starom ¹týle\n" +#: lib/package.c:53 +#, fuzzy +msgid "packaging version 1 is notsupported by this version of RPM" +msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3" -#: lib/package.c:322 +#: lib/package.c:113 +#, fuzzy msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3" #: lib/poptBT.c:82 @@ -3853,11 +3822,6 @@ msgstr "pres msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4110,6 +4074,30 @@ msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" #, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "riadok %d: Znetvorený popis: %s" + +#, fuzzy +#~ msgid "%s: %-45s YES (added package)\n" +#~ msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (db packages)\n" +#~ msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" + +#~ msgid "package is a version one package!\n" +#~ msgstr "balík je verzie jedna!\n" + +#~ msgid "old style source package -- I'll do my best\n" +#~ msgstr "zdrojový balík v starom ¹týle - urobím, èo sa dá\n" + +#~ msgid "archive offset is %d\n" +#~ msgstr "posunutie v archíve je %d\n" + +#~ msgid "old style binary package\n" +#~ msgstr "binárny balík v starom ¹týle\n" + +#, fuzzy #~ msgid "" #~ " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " #~ "]" diff --git a/po/sl.po b/po/sl.po index be745f3..60f7f36 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.78 2000/07/13 23:30:43 jbj Exp $ +# $Id: sl.po,v 1.79 2000/07/15 14:53:58 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 3.0.4\n" -"POT-Creation-Date: 2000-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: 2000-02-17 22:25+01:00\n" "Last-Translator: Primo¾ Peterlin \n" "Language-Team: Slovenian \n" @@ -2108,32 +2108,27 @@ msgstr "vrstica %d: polje Epoch/Serial mora biti msgid "line %d: Bad BuildArchitecture format: %s" msgstr "vrstica %d: okvarjena oblika BuildArchitecture: %s" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "vrstica %d: Deformirana znaèka: %s" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "Interna napaka: Neprava znaèka %d" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "Okvarjeno doloèilo paketa: %s" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "Paket ¾e obstaja: %s" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "vrstica %d: Neznana znaèka: %s" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "Datoteka spec ne more uporabiti BuildRoot" @@ -2302,56 +2297,56 @@ msgstr "vrstica %d: Okvarjeno msgid "line %d: Bad %s number: %s\n" msgstr "vrstica %d: Okvarjeno ¹tevilo %s: %s\n" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "ni mo¾no preimenovati %s v %s: %s\n" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "ni mo¾no zbrisati %s: %s\n" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "(napaka 0x%x)" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "Okvarjeno magièno ¹tevilo" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "Okvarjena/neberljiva glava" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "Glava predolga" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "Neznan tip datoteke" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "Trda povezava manjka" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "Interna napaka" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr " neuspe¹no - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2360,84 +2355,69 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:836 +#: lib/depends.c:825 #, fuzzy, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %s zadovoljen ob dodatnem seznamu datotek.\n" -#: lib/depends.c:885 -#, fuzzy, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "%s: %s zadovoljen ob dodatnem paketu.\n" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, fuzzy, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %s zadovoljen ob dodatni ponudbi.\n" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n" -#: lib/depends.c:985 +#: lib/depends.c:951 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %s zadovoljen ob ponudbi db.\n" -#: lib/depends.c:1032 -#, fuzzy, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "%s: %s zadovoljen ob paketih db.\n" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, 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:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "paket %s zahteva, a ni zadovoljeno: %s\n" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s v sporu: %s\n" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "zanka v predpogojevani verigi: %s" @@ -2757,7 +2737,7 @@ msgstr "izvorni paket ne vsebuje datoteke .spec" msgid "renaming %s to %s\n" msgstr "preimenujemo %s v %s\n" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "preimenovanje %s v %s neuspe¹no: %s" @@ -2766,30 +2746,30 @@ msgstr "preimenovanje %s v %s neuspe msgid "source package expected, binary found" msgstr "prièakovan izvorni paket, najden binarni" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "ustavljamo namestitev ker teèemo kot --test\n" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "poganjamo prednamestitvene skripte (èe obstajajo)\n" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "opozorilo: %s ustvarjen kot %s" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "opozorilo: %s shranjen kot %s" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "poganjamo ponamestitvene skripte (èe obstajajo)\n" @@ -2803,26 +2783,15 @@ msgstr "napaka pri ustvarjanju za msgid "bad file state: %s" msgstr "okvarjeno stanje datoteke: %s" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "paket je paket razlièica ena!\n" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "izvorni paket v starem zapisu -- posku¹amo, kar se da\n" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "odmik arhiva je %d\n" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "binarni paket v starem zapisu\n" +#: lib/package.c:53 +#, fuzzy +msgid "packaging version 1 is notsupported by this version of RPM" +msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3" -#: lib/package.c:322 +#: lib/package.c:113 +#, fuzzy msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3" #: lib/poptBT.c:82 @@ -3835,11 +3804,6 @@ msgstr "prestavljamo imenik %s v %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4089,6 +4053,30 @@ msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" #, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "vrstica %d: Deformirana znaèka: %s" + +#, fuzzy +#~ msgid "%s: %-45s YES (added package)\n" +#~ msgstr "%s: %s zadovoljen ob dodatnem paketu.\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (db packages)\n" +#~ msgstr "%s: %s zadovoljen ob paketih db.\n" + +#~ msgid "package is a version one package!\n" +#~ msgstr "paket je paket razlièica ena!\n" + +#~ msgid "old style source package -- I'll do my best\n" +#~ msgstr "izvorni paket v starem zapisu -- posku¹amo, kar se da\n" + +#~ msgid "archive offset is %d\n" +#~ msgstr "odmik arhiva je %d\n" + +#~ msgid "old style binary package\n" +#~ msgstr "binarni paket v starem zapisu\n" + +#, fuzzy #~ msgid "" #~ " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " #~ "]" diff --git a/po/sr.po b/po/sr.po index 6985318..6910c15 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" @@ -2129,32 +2129,27 @@ msgstr "pogre msgid "line %d: Bad BuildArchitecture format: %s" msgstr "nedostaje arhitektura za %s na %s:%d" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "pogre¹an broj paketa: %s\n" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Opcije odrednice paketa:" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2323,143 +2318,128 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "Neuspelo èitanje %s: %s." -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "gre¹ka: " -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 #, fuzzy msgid "Unknown file type" msgstr "(nepoznat tip)" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 #, fuzzy msgid "Internal error" msgstr "fatalna gre¹ka: " -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 #, fuzzy msgid " failed - " msgstr "PGP omanuo" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, fuzzy, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "datoteka %s ne pripada nijednom paketu\n" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, fuzzy, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "datoteka %s ne pripada nijednom paketu\n" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, 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:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "paket %s nije naveden u %s" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "petlja u lancu: %s" @@ -2779,7 +2759,7 @@ msgstr "upit nad paketom koji ima " msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "preimenovanje %s u %s nije uspelo: %s" @@ -2788,30 +2768,30 @@ msgstr "preimenovanje %s u %s nije uspelo: %s" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, 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:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2825,26 +2805,15 @@ msgstr "gre msgid "bad file state: %s" msgstr "neuspelo otvaranje %s: %s" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" +#: lib/package.c:53 +#, fuzzy +msgid "packaging version 1 is notsupported by this version of RPM" +msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a" -#: lib/package.c:322 +#: lib/package.c:113 +#, fuzzy msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a" #: lib/poptBT.c:82 @@ -3886,11 +3855,6 @@ msgstr "gre msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4149,6 +4113,18 @@ msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" #, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "pogre¹an broj paketa: %s\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (added package)\n" +#~ msgstr "datoteka %s ne pripada nijednom paketu\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (db packages)\n" +#~ msgstr "datoteka %s ne pripada nijednom paketu\n" + +#, fuzzy #~ msgid "" #~ " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " #~ "]" diff --git a/po/sv.po b/po/sv.po index 734654f..12f61f7 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: 2000-06-22 23:35+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -2027,32 +2027,27 @@ msgstr "rad %d: Epoch/Serial-f msgid "line %d: Bad BuildArchitecture format: %s" msgstr "rad %d: Felaktig BuildArchitecture-format: %s" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "rad %d: Felaktig tagg: %s" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "Internt fel: felaktig tagg %d" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "Felaktig paketspecifikation: %s" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "Paketet existerar redan: %s" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "rad %d: Okänd tagg: %s" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "Spec-fil kan inte använda BuildRoot" @@ -2219,56 +2214,56 @@ msgstr "rad %d: Felaktigt no%s-tal: %d" msgid "line %d: Bad %s number: %s\n" msgstr "rad %d: Felaktigt %s-tal: %s\n" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "kan inte flytta %s till %s: %s\n" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "kan inte ta bort %s: %s\n" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "getNextHeader: %s\n" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "(fel 0x%x)" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "Felaktigt magiskt tal" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "Felaktigt/oläsbart huvud" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "Huvudstorlek för stor" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "Okänd filtyp" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "Saknad hårdlänk" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "Internt fel" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr " misslyckades - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2277,84 +2272,69 @@ msgstr "" "\"B\"-beroendet beghöver en epok (antar samma som \"A\")\n" " A %s B %s\n" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %-45s JA (lade till filer)\n" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "%s: %-45s JA (lade till paket)\n" - -#: lib/depends.c:889 -#, 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:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %-45s JA (lade till tillhandahållande)\n" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "%s: %-45s %-3s (cachad)\n" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:985 +#: lib/depends.c:951 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s JA (db-filer)\n" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s JA (db tillhandahållande)\n" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "%s: %-45s JA (db-paket)\n" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NEJ\n" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, 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:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "paket %s behov inte uppfyllda: %s\n" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s står i konflikt: %s\n" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "cirkularitet i kedja av förutsättningar: %s" @@ -2675,7 +2655,7 @@ msgstr "k msgid "renaming %s to %s\n" msgstr "byter namn på %s till %s\n" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "namnbyte från %s till %s misslyckades: %s" @@ -2684,30 +2664,30 @@ msgstr "namnbyte fr msgid "source package expected, binary found" msgstr "källpaket förväntades, fann binärpaket" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "paket: %s-%s-%s filtest = %d\n" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "avbryter installation eftersom vi kör --test\n" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "kör (eventuellt) preinstalltionsskript\n" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "varning: %s skapades som %s" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "varning: %s sparades som %s" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "kör (eventuellt) postinstallationsskript\n" @@ -2721,26 +2701,15 @@ msgstr "fel n msgid "bad file state: %s" msgstr "felaktig filstatus: %s" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "paketets format är rpm version ett!\n" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "källpaket av gammal typ -- jag gör så gott jag kan\n" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "arkivoffset är %d\n" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "binärpaket av gammal typ\n" +#: lib/package.c:53 +#, fuzzy +msgid "packaging version 1 is notsupported by this version of RPM" +msgstr "endast paket med huvudnummer <= 3 stöds av denna version av RPM" -#: lib/package.c:322 +#: lib/package.c:113 +#, fuzzy msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "endast paket med huvudnummer <= 3 stöds av denna version av RPM" #: lib/poptBT.c:82 @@ -3770,11 +3739,6 @@ msgstr "flyttar katalogen %s till %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4023,6 +3987,31 @@ msgstr "url-port m msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" +#, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "rad %d: Felaktig tagg: %s" + +#~ msgid "%s: %-45s YES (added package)\n" +#~ msgstr "%s: %-45s JA (lade till paket)\n" + +#~ msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" +#~ msgstr "%s: %-45s JA (lade till paket, BORDE INTE HÄNDA)\n" + +#~ msgid "%s: %-45s YES (db packages)\n" +#~ msgstr "%s: %-45s JA (db-paket)\n" + +#~ msgid "package is a version one package!\n" +#~ msgstr "paketets format är rpm version ett!\n" + +#~ msgid "old style source package -- I'll do my best\n" +#~ msgstr "källpaket av gammal typ -- jag gör så gott jag kan\n" + +#~ msgid "archive offset is %d\n" +#~ msgstr "arkivoffset är %d\n" + +#~ msgid "old style binary package\n" +#~ msgstr "binärpaket av gammal typ\n" + #~ msgid "" #~ " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " #~ "]" diff --git a/po/tr.po b/po/tr.po index 3ea032c..ec7a833 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2170,32 +2170,27 @@ msgstr "ge msgid "line %d: Bad BuildArchitecture format: %s" msgstr "%s için %s te eksik mimari:%d" -#: build/parsePreamble.c:539 -#, fuzzy, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "geçersiz paket numarsý: %s\n" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, fuzzy, c-format msgid "Bad package specification: %s" msgstr " Paket seçim seçenekleri:" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2365,143 +2360,128 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "geçersiz paket numarsý: %s\n" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, fuzzy, c-format msgid "can't rename %s to %s: %s\n" msgstr "%s okunamadý: %s" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, fuzzy, c-format msgid "(error 0x%x)" msgstr "hata: " -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 #, fuzzy msgid "Unknown file type" msgstr "(bilinmeyen tip)" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 #, fuzzy msgid "Internal error" msgstr "ölümcül hata: " -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 #, fuzzy msgid " failed - " msgstr "PGP hata verdi" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, fuzzy, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "%s dosyasý, hiç bir pakete ait deðil\n" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s dosyasý, hiç bir pakete ait deðil\n" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, fuzzy, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "%s dosyasý, hiç bir pakete ait deðil\n" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, 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:1122 +#: lib/depends.c:1072 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "%s paketi %s altýnda gözükmüyor" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "%s paketi %s altýnda gözükmüyor" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "gerekenler zincirinde döngü: %s" @@ -2821,7 +2801,7 @@ msgstr " isimli dosyay msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 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" @@ -2830,30 +2810,30 @@ msgstr "%s 'nin isminin %s 'ye msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, 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:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2867,26 +2847,16 @@ msgstr "%s dizinin olu msgid "bad file state: %s" msgstr "%s açýlamadý: %s" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" -msgstr "" - -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" +#: lib/package.c:53 +#, fuzzy +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" +"RPM'in bu sürümünde sadece major numarasý <= 3 olan paketler destekleniyor" -#: lib/package.c:322 +#: lib/package.c:113 +#, fuzzy msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" "RPM'in bu sürümünde sadece major numarasý <= 3 olan paketler destekleniyor" @@ -3931,11 +3901,6 @@ msgstr "%s dizinin olu msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" @@ -4194,6 +4159,18 @@ msgid "failed to create %s: %s\n" msgstr "%s yaratýlamýyor\n" #, fuzzy +#~ msgid "line %d: Invalid tag value: %s" +#~ msgstr "geçersiz paket numarsý: %s\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (added package)\n" +#~ msgstr "%s dosyasý, hiç bir pakete ait deðil\n" + +#, fuzzy +#~ msgid "%s: %-45s YES (db packages)\n" +#~ msgstr "%s dosyasý, hiç bir pakete ait deðil\n" + +#, fuzzy #~ msgid "" #~ " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " #~ "]" diff --git a/po/uk.po b/po/uk.po index b0db1ec..35f0750 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-07-13 19:28-0400\n" +"POT-Creation-Date: 2000-07-15 10:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1975,32 +1975,27 @@ msgstr "" msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: build/parsePreamble.c:539 -#, c-format -msgid "line %d: Invalid tag value: %s" -msgstr "" - -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:536 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: build/parsePreamble.c:693 +#: build/parsePreamble.c:675 #, c-format msgid "Bad package specification: %s" msgstr "" -#: build/parsePreamble.c:699 +#: build/parsePreamble.c:681 #, c-format msgid "Package already exists: %s" msgstr "" -#: build/parsePreamble.c:726 +#: build/parsePreamble.c:708 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: build/parsePreamble.c:751 +#: build/parsePreamble.c:733 msgid "Spec file can't use BuildRoot" msgstr "" @@ -2167,140 +2162,125 @@ msgstr "" msgid "line %d: Bad %s number: %s\n" msgstr "" -#: lib/cpio.c:361 +#: lib/cpio.c:362 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "" -#: lib/cpio.c:367 +#: lib/cpio.c:368 #, c-format msgid "can't unlink %s: %s\n" msgstr "" -#: lib/cpio.c:611 +#: lib/cpio.c:612 #, c-format msgid "getNextHeader: %s\n" msgstr "" -#: lib/cpio.c:1072 +#: lib/cpio.c:1073 #, c-format msgid "(error 0x%x)" msgstr "" -#: lib/cpio.c:1075 +#: lib/cpio.c:1076 msgid "Bad magic" msgstr "" -#: lib/cpio.c:1076 +#: lib/cpio.c:1077 msgid "Bad/unreadable header" msgstr "" -#: lib/cpio.c:1094 +#: lib/cpio.c:1095 msgid "Header size too big" msgstr "" -#: lib/cpio.c:1095 +#: lib/cpio.c:1096 msgid "Unknown file type" msgstr "" -#: lib/cpio.c:1096 +#: lib/cpio.c:1097 msgid "Missing hard link" msgstr "" -#: lib/cpio.c:1097 +#: lib/cpio.c:1098 msgid "Internal error" msgstr "" -#: lib/cpio.c:1106 +#: lib/cpio.c:1107 msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:467 +#: lib/depends.c:456 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:496 +#: lib/depends.c:485 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:836 +#: lib/depends.c:825 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:885 -#, c-format -msgid "%s: %-45s YES (added package)\n" -msgstr "" - -#: lib/depends.c:889 -#, c-format -msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n" -msgstr "" - -#: lib/depends.c:908 +#: lib/depends.c:874 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:952 +#: lib/depends.c:918 #, c-format msgid "%s: %-45s %-3s (cached)\n" msgstr "" -#: lib/depends.c:969 +#: lib/depends.c:935 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:985 +#: lib/depends.c:951 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1005 +#: lib/depends.c:971 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1018 +#: lib/depends.c:984 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1032 -#, c-format -msgid "%s: %-45s YES (db packages)\n" -msgstr "" - -#: lib/depends.c:1047 +#: lib/depends.c:997 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1068 +#: lib/depends.c:1018 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1122 +#: lib/depends.c:1072 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1189 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1315 +#: lib/depends.c:1265 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2616,7 +2596,7 @@ msgstr "" msgid "renaming %s to %s\n" msgstr "" -#: lib/install.c:748 lib/install.c:1028 lib/uninstall.c:28 +#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28 #, c-format msgid "rename of %s to %s failed: %s" msgstr "" @@ -2625,30 +2605,30 @@ msgstr "" msgid "source package expected, binary found" msgstr "" -#: lib/install.c:897 +#: lib/install.c:890 #, c-format msgid "package: %s-%s-%s files test = %d\n" msgstr "" -#: lib/install.c:957 +#: lib/install.c:950 msgid "stopping install as we're running --test\n" msgstr "" -#: lib/install.c:962 +#: lib/install.c:955 msgid "running preinstall script (if any)\n" msgstr "" -#: lib/install.c:987 +#: lib/install.c:980 #, c-format msgid "warning: %s created as %s" msgstr "" -#: lib/install.c:1024 +#: lib/install.c:1017 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/install.c:1112 +#: lib/install.c:1105 msgid "running postinstall scripts (if any)\n" msgstr "" @@ -2662,26 +2642,13 @@ msgstr "" msgid "bad file state: %s" msgstr "" -#: lib/package.c:237 -msgid "package is a version one package!\n" -msgstr "" - -#: lib/package.c:242 -msgid "old style source package -- I'll do my best\n" +#: lib/package.c:53 +msgid "packaging version 1 is notsupported by this version of RPM" msgstr "" -#: lib/package.c:245 -#, c-format -msgid "archive offset is %d\n" -msgstr "" - -#: lib/package.c:256 -msgid "old style binary package\n" -msgstr "" - -#: lib/package.c:322 +#: lib/package.c:113 msgid "" -"only packages with major numbers <= 3 are supported by this version of RPM" +"only packaging with major numbers <= 4 is supported by this version of RPM" msgstr "" #: lib/poptBT.c:82 @@ -3676,11 +3643,6 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1383 -#, c-format -msgid "executing pre-transaction syscall: \"%s\"\n" -msgstr "" - #: lib/uninstall.c:42 #, c-format msgid "cannot remove %s - directory not empty" diff --git a/python/Makefile.in b/python/Makefile.in index a9d39db..b9eb16a 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -68,7 +68,6 @@ target_triplet = @target@ AR = @AR@ AS = @AS@ AWK = @AWK@ -BUILD_RPMCONVERT = @BUILD_RPMCONVERT@ BUILD_RPMNLSTOOLS = @BUILD_RPMNLSTOOLS@ BZIP2BIN = @BZIP2BIN@ CATALOGS = @CATALOGS@ diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 3d7b6cd..e3c0e78 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -29,10 +29,6 @@ typedef struct hdrObject_s hdrObject; /* rpmdb functions */ static void rpmdbDealloc(rpmdbObject * s); static PyObject * rpmdbGetAttr(rpmdbObject * s, char * name); -#ifdef DYING -static PyObject * rpmdbFirst(rpmdbObject * s, PyObject * args); -static PyObject * rpmdbNext(rpmdbObject * s, PyObject * args); -#endif static PyObject * rpmdbByName(rpmdbObject * s, PyObject * args); static PyObject * rpmdbByProvides(rpmdbObject * s, PyObject * args); static PyObject * rpmdbByFile(rpmdbObject * s, PyObject * args); @@ -236,10 +232,6 @@ static PyTypeObject rpmtransType = { }; static struct PyMethodDef rpmdbMethods[] = { -#ifdef DYING - {"firstkey", (PyCFunction) rpmdbFirst, 1 }, - {"nextkey", (PyCFunction) rpmdbNext, 1 }, -#endif {"findbyfile", (PyCFunction) rpmdbByFile, 1 }, {"findbyname", (PyCFunction) rpmdbByName, 1 }, {"findbyprovides", (PyCFunction) rpmdbByProvides, 1 }, @@ -829,62 +821,6 @@ static void rpmdbDealloc(rpmdbObject * s) { } } -#ifdef DYING -static PyObject * rpmdbFirst(rpmdbObject * s, PyObject * args) { - int first; - - if (!PyArg_ParseTuple (args, "")) return NULL; - - first = rpmdbFirstRecNum(s->db); - - if (!first) { - PyErr_SetString(pyrpmError, "cannot find first entry in database\n"); - return NULL; - } - - return Py_BuildValue("i", first); -} -#endif - -#ifdef DYING -static PyObject * rpmdbNext(rpmdbObject * s, PyObject * args) { - int where; - - if (!PyArg_ParseTuple (args, "i", &where)) return NULL; - - where = rpmdbNextRecNum(s->db, where); - - if (!where) { - Py_INCREF(Py_None); - return Py_None; - } - - return Py_BuildValue("i", where); -} -#endif - -#ifdef DYING -static PyObject * handleDbResult(int rc, dbiIndexSet matches) { - PyObject * list; - int i; - - if (rc == -1) { - PyErr_SetString(pyrpmError, "error reading from database"); - return NULL; - } - - list = PyList_New(0); - - if (!rc) { - for (i = 0; i < dbiIndexSetCount(matches); i++) - PyList_Append(list, PyInt_FromLong(dbiIndexRecordOffset(matches, i))); - - dbiFreeIndexSet(matches); - } - - return list; -} -#else /* DYING */ static PyObject * handleDbResult(rpmdbMatchIterator mi) { PyObject * list; @@ -903,22 +839,13 @@ static PyObject * handleDbResult(rpmdbMatchIterator mi) { return list; } -#endif static PyObject * rpmdbByName(rpmdbObject * s, PyObject * args) { char * str; if (!PyArg_ParseTuple(args, "s", &str)) return NULL; -#ifdef DYING - { dbiIndexSet matches; - int rc; - rc = rpmdbFindPackage(s->db, str, &matches); - return handleDbResult(rc, matches); - } -#else return handleDbResult(rpmdbInitIterator(s->db, RPMTAG_NAME, str, 0)); -#endif } static PyObject * rpmdbByFile(rpmdbObject * s, PyObject * args) { @@ -926,15 +853,7 @@ static PyObject * rpmdbByFile(rpmdbObject * s, PyObject * args) { if (!PyArg_ParseTuple(args, "s", &str)) return NULL; -#ifdef DYING - { dbiIndexSet matches; - int rc; - rc = rpmdbFindByFile(s->db, str, &matches); - return handleDbResult(rc, matches); - } -#else return handleDbResult(rpmdbInitIterator(s->db, RPMTAG_BASENAMES, str, 0)); -#endif } static PyObject * rpmdbByProvides(rpmdbObject * s, PyObject * args) { @@ -942,32 +861,13 @@ static PyObject * rpmdbByProvides(rpmdbObject * s, PyObject * args) { if (!PyArg_ParseTuple(args, "s", &str)) return NULL; -#ifdef DYING - { dbiIndexSet matches; - int rc; - rc = rpmdbFindByProvides(s->db, str, &matches); - return handleDbResult(rc, matches); - } -#else return handleDbResult(rpmdbInitIterator(s->db, RPMTAG_PROVIDENAME, str, 0)); -#endif } static int rpmdbLength(rpmdbObject * s) { int count = 0; -#ifdef DYING - int first; - - first = rpmdbFirstRecNum(s->db); - if (!first) return 0; - - count++; - while ((first = rpmdbNextRecNum(s->db, first))) { - count++; - } -#else { rpmdbMatchIterator mi; /* RPMDBI_PACKAGES */ @@ -977,7 +877,6 @@ rpmdbLength(rpmdbObject * s) { count++; rpmdbFreeIterator(mi); } -#endif return count; } @@ -996,16 +895,12 @@ rpmdbSubscript(rpmdbObject * s, PyObject * key) { h = PyObject_NEW(hdrObject, &hdrType); h->h = NULL; -#ifdef DYING - h->h = rpmdbGetRecord(s->db, offset); -#else { rpmdbMatchIterator mi; mi = rpmdbInitIterator(s->db, RPMDBI_PACKAGES, &offset, sizeof(offset)); if ((h->h = rpmdbNextIterator(mi)) != NULL) h->h = headerLink(h->h); rpmdbFreeIterator(mi); } -#endif h->fileList = h->linkList = h->md5list = NULL; h->uids = h->gids = h->mtimes = h->fileSizes = NULL; h->modes = h->rdevs = NULL; diff --git a/python/upgrade.c b/python/upgrade.c index 7a09b68..b1d0875 100644 --- a/python/upgrade.c +++ b/python/upgrade.c @@ -104,27 +104,11 @@ static void addLostFiles(rpmdb db, struct pkgSet *psp, struct hash_table *ht) char **installedDirs; int_32 * installedDirIndexes; int installedFileCount; - - { Header h = NULL; - -#ifdef DYING - int num; - - for (num = rpmdbFirstRecNum(db); - num > 0; - num = rpmdbNextRecNum(db, num)) - { - if (h) { - headerFree(h); - h = NULL; - } - h = rpmdbGetRecord(db, num); -#else + Header h = NULL; rpmdbMatchIterator mi; mi = rpmdbInitIterator(db, RPMDBI_PACKAGES, NULL, 0); while ((h = rpmdbNextIterator(mi)) != NULL) { -#endif headerGetEntry(h, RPMTAG_NAME, NULL, (void **) &name, NULL); if (name && !strcmp(name, "metroess")) { @@ -152,18 +136,9 @@ static void addLostFiles(rpmdb db, struct pkgSet *psp, struct hash_table *ht) free(installedDirs); } } -#ifndef DYING } rpmdbFreeIterator(mi); -#else - } - if (h) { - headerFree(h); - h = NULL; - } -#endif - } } static int findPackagesWithObsoletes(rpmdb db, struct pkgSet *psp) @@ -183,26 +158,10 @@ static int findPackagesWithObsoletes(rpmdb db, struct pkgSet *psp) if (headerGetEntryMinMemory((*pip)->h, RPMTAG_OBSOLETENAME, NULL, (void **) &obsoletes, &obsoletesCount)) { while (obsoletesCount--) { -#ifdef DYING - dbiIndexSet matches; - int rc; - - rc = rpmdbFindPackage(db, obsoletes[obsoletesCount], &matches); - if (!rc) { - if (dbiIndexSetCount(matches)) { - (*pip)->selected = 1; - dbiFreeIndexSet(matches); - break; - } - - dbiFreeIndexSet(matches); - } -#else if (rpmdbCountPackages(db, obsoletes[obsoletesCount]) > 0) { (*pip)->selected = 1; break; } -#endif } free(obsoletes); @@ -224,10 +183,6 @@ static int findUpgradePackages(rpmdb db, struct pkgSet *psp, int skipThis; Header h, installedHeader; char *name; -#ifdef DYING - dbiIndexSet matches; - int rc, i; -#endif int count; char **installedFiles, **availFiles; char **installedDirs, ** availDirs; @@ -248,33 +203,7 @@ static int findUpgradePackages(rpmdb db, struct pkgSet *psp, } DEBUG (("Avail: %s\n", name)); -#ifdef DYING - rc = rpmdbFindPackage(db, name, &matches); - if (rc == 0) { - skipThis = 0; - rpmErrorSetCallback(errorFunction); - for (i = 0; i < dbiIndexSetCount(matches); i++) { - installedHeader = - rpmdbGetRecord(db, dbiIndexRecordOffset(matches, i)); - if (rpmVersionCompare(installedHeader, h) >= 0) { - /* already have a newer version installed */ - DEBUG (("Already have newer version\n")) - skipThis = 1; - headerFree(installedHeader); - break; - } - headerFree(installedHeader); - } - rpmErrorSetCallback(NULL); - if (! skipThis) { - DEBUG (("No newer version installed\n")) - } - } else { - skipThis = 1; - DEBUG (("Not installed\n")) - } -#else { rpmdbMatchIterator mi; mi = rpmdbInitIterator(db, RPMTAG_NAME, name, 0); @@ -294,7 +223,6 @@ static int findUpgradePackages(rpmdb db, struct pkgSet *psp, DEBUG (("No newer version installed\n")) } } -#endif if (skipThis) { DEBUG (("DO NOT INSTALL\n")) @@ -313,31 +241,6 @@ static int findUpgradePackages(rpmdb db, struct pkgSet *psp, (void **) &availDirIndexes, NULL); } -#ifdef DYING - for (i = 0; i < dbiIndexSetCount(matches); i++) { - /* Compare the file lists */ - installedHeader = - rpmdbGetRecord(db, dbiIndexRecordOffset(matches, i)); - if (headerGetEntryMinMemory(installedHeader, RPMTAG_BASENAMES, - NULL, (void **) &installedFiles, - &installedFileCount)) { - headerGetEntryMinMemory(installedHeader, RPMTAG_DIRNAMES, - NULL, (void **) &installedDirs, NULL); - headerGetEntryMinMemory(installedHeader, RPMTAG_DIRINDEXES, - NULL, (void **) &installedDirIndexes, NULL); - - compareFileList(availFileCount, availFiles, - availDirs, availDirIndexes, - installedFileCount, installedFiles, - installedDirs, installedDirIndexes, - ht); - - free(installedFiles); - free(installedDirs); - } - headerFree(installedHeader); - } -#else { rpmdbMatchIterator mi; mi = rpmdbInitIterator(db, RPMTAG_NAME, name, 0); while((installedHeader = rpmdbNextIterator(mi)) != NULL) { @@ -361,7 +264,6 @@ static int findUpgradePackages(rpmdb db, struct pkgSet *psp, } rpmdbFreeIterator(mi); } -#endif if (availFiles) { free(availFiles); @@ -369,12 +271,6 @@ static int findUpgradePackages(rpmdb db, struct pkgSet *psp, } } -#ifdef DYING - if (rc == 0) { - dbiFreeIndexSet(matches); - } -#endif - DEBUG (("\n\n")) pip++; @@ -524,32 +420,7 @@ static int unmarkPackagesAlreadyInstalled(rpmdb db, struct pkgSet *psp) /*logMessage("Failed with bad header");*/ return(-1); } -#ifdef DYING - { dbiIndexSet matches; - int rc; - int i; - - rc = rpmdbFindPackage(db, name, &matches); - if (rc == 0) { - rpmErrorSetCallback(errorFunction); - for (i = 0; i < dbiIndexSetCount(matches); i++) { - installedHeader = - rpmdbGetRecord(db, dbiIndexRecordOffset(matches, i)); - if (rpmVersionCompare(installedHeader, h) >= 0) { - /* already have a newer version installed */ - DEBUG (("Already have newer version\n")) - (*pip)->selected = 0; - headerFree(installedHeader); - break; - } - headerFree(installedHeader); - } - rpmErrorSetCallback(NULL); - dbiFreeIndexSet(matches); - } - } -#else - { rpmdbMatchIterator mi; + { rpmdbMatchIterator mi; mi = rpmdbInitIterator(db, RPMTAG_NAME, name, 0); rpmErrorSetCallback(errorFunction); @@ -563,8 +434,7 @@ static int unmarkPackagesAlreadyInstalled(rpmdb db, struct pkgSet *psp) } rpmdbFreeIterator(mi); rpmErrorSetCallback(NULL); - } -#endif + } } pip++; diff --git a/rpm.spec b/rpm.spec index 8906012..30ce293 100644 --- a/rpm.spec +++ b/rpm.spec @@ -8,7 +8,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 4.0 Version: %{version} -Release: 0.53 +Release: 0.54 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -257,6 +257,14 @@ fi %{__prefix}/include/popt.h %changelog +* Sat Jul 15 2000 Jeff Johnson +- rip out pre-transaction syscalls, more design is needed. +- display rpmlib provides when invoked with --showrc. +- remove (dead) dependency checks on implicitly provided package names. +- remove (dead) rpmdb API code in python bindings. +- remove (legacy) support for version 1 packaging. +- remove (legacy) support for converting gdbm databases. + * Thu Jul 13 2000 Jeff Johnson - fix: initialize pretransaction argv (segfault). - fix: check rpmlib features w/o database (and check earlier as well). diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 38ffbde..e71282b 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -68,7 +68,6 @@ target_triplet = @target@ AR = @AR@ AS = @AS@ AWK = @AWK@ -BUILD_RPMCONVERT = @BUILD_RPMCONVERT@ BUILD_RPMNLSTOOLS = @BUILD_RPMNLSTOOLS@ BZIP2BIN = @BZIP2BIN@ CATALOGS = @CATALOGS@ -- 2.7.4