From 190b5df3693c0368d8a2483626f20c19919130d9 Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 26 Dec 2000 13:10:18 +0000 Subject: [PATCH] - send query/verify output through rpmlog(). - resurrect rpmErrorSetCallback() and rpmErrorString(). CVS patchset: 4372 CVS date: 2000/12/26 13:10:18 --- CHANGES | 2 + lib/install.c | 8 +- lib/query.c | 352 ++++++++++++++++++++++++++++------------------------- lib/rpmlib.h | 18 +-- lib/verify.c | 161 +++++++++++++++--------- po/cs.po | 80 ++++++------ po/da.po | 76 ++++++------ po/de.po | 82 ++++++------- po/es.po | 72 +++++------ po/fi.po | 82 ++++++------- po/fr.po | 76 ++++++------ po/gl.po | 72 +++++------ po/hu.po | 72 +++++------ po/id.po | 72 +++++------ po/is.po | 76 ++++++------ po/it.po | 72 +++++------ po/ja.po | 82 ++++++------- po/ko.po | 72 +++++------ po/no.po | 80 ++++++------ po/pl.po | 80 ++++++------ po/pt.po | 72 +++++------ po/pt_BR.po | 77 ++++++------ po/ro.po | 72 +++++------ po/rpm.pot | 72 +++++------ po/ru.po | 80 ++++++------ po/sk.po | 80 ++++++------ po/sl.po | 82 ++++++------- po/sr.po | 82 ++++++------- po/sv.po | 80 ++++++------ po/tr.po | 82 ++++++------- po/uk.po | 72 +++++------ po/wa.po | 72 +++++------ po/zh.po | 72 +++++------ po/zh_CN.GB2312.po | 72 +++++------ python/rpmmodule.c | 4 +- rpm.spec | 6 +- rpm.spec.in | 6 +- rpmio/rpmerr.h | 4 +- rpmio/rpmlog.c | 10 ++ rpmio/rpmlog.h | 13 ++ 40 files changed, 1452 insertions(+), 1345 deletions(-) diff --git a/CHANGES b/CHANGES index 5c9a6ad..f946956 100644 --- a/CHANGES +++ b/CHANGES @@ -76,6 +76,8 @@ - whiteout mozilla loop for 7.1. - immutable headers, once installed by rpm3, need to lose immutablity. - fix: removed headers from db need a headerCopy(). + - send query/verify output through rpmlog(). + - resurrect rpmErrorSetCallback() and rpmErrorString(). 3.0.6 -> 4.0 - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. diff --git a/lib/install.c b/lib/install.c index 81cfeac..cbb9d18 100644 --- a/lib/install.c +++ b/lib/install.c @@ -212,7 +212,7 @@ static void setFileOwners(Header h, struct fileInfo * files, int fileCount) for (i = 0; i < fileCount; i++) { if (unameToUid(fileOwners[i], &files[i].uid)) { rpmMessage(RPMMESS_WARNING, - _("user %s does not exist - using root"), fileOwners[i]); + _("user %s does not exist - using root\n"), fileOwners[i]); files[i].uid = 0; /* turn off the suid bit */ files[i].mode &= ~S_ISUID; @@ -220,7 +220,7 @@ static void setFileOwners(Header h, struct fileInfo * files, int fileCount) if (gnameToGid(fileGroups[i], &files[i].gid)) { rpmMessage(RPMMESS_WARNING, - _("group %s does not exist - using root"), fileGroups[i]); + _("group %s does not exist - using root\n"), fileGroups[i]); files[i].gid = 0; /* turn off the sgid bit */ files[i].mode &= ~S_ISGID; @@ -1059,7 +1059,7 @@ int installBinaryPackage(const rpmTransactionSet ts, FD_t fd, Header h, case FA_ALTNAME: newpath = alloca(strlen(files[i].relativePath) + 20); (void)stpcpy(stpcpy(newpath, files[i].relativePath), ".rpmnew"); - rpmMessage(RPMMESS_WARNING, _("%s created as %s"), + rpmMessage(RPMMESS_WARNING, _("%s created as %s\n"), files[i].relativePath, newpath); files[i].relativePath = newpath; break; @@ -1095,7 +1095,7 @@ int installBinaryPackage(const rpmTransactionSet ts, FD_t fd, Header h, if (ext && access(files[i].relativePath, F_OK) == 0) { newpath = alloca(strlen(files[i].relativePath) + 20); (void)stpcpy(stpcpy(newpath, files[i].relativePath), ext); - rpmMessage(RPMMESS_WARNING, _("%s saved as %s"), + rpmMessage(RPMMESS_WARNING, _("%s saved as %s\n"), files[i].relativePath, newpath); if (rename(files[i].relativePath, newpath)) { diff --git a/lib/query.c b/lib/query.c index a4c82b9..16870d6 100644 --- a/lib/query.c +++ b/lib/query.c @@ -59,7 +59,7 @@ static char * permsString(int mode) return perms; } -static void printFileInfo(FILE *fp, const char * name, +static void printFileInfo(char * te, const char * name, unsigned int size, unsigned short mode, unsigned int mtime, unsigned short rdev, unsigned int nlink, @@ -136,25 +136,23 @@ static void printFileInfo(FILE *fp, const char * name, (void)strftime(timefield, sizeof(timefield) - 1, fmt, tm); } - fprintf(fp, "%s %4d %-8s%-8s %10s %s %s\n", perms, (int)nlink, - ownerfield, groupfield, sizefield, timefield, namefield); + sprintf(te, "%s %4d %-8s%-8s %10s %s %s", perms, + (int)nlink, ownerfield, groupfield, sizefield, timefield, namefield); if (perms) free(perms); } -static int queryHeader(FILE *fp, Header h, const char * chptr) +static inline char * queryHeader(char * te, Header h, const char * qfmt) { - char * str; const char * errstr; + const char * str; - str = headerSprintf(h, chptr, rpmTagTable, rpmHeaderFormats, &errstr); + str = headerSprintf(h, qfmt, rpmTagTable, rpmHeaderFormats, &errstr); if (str == NULL) { - fprintf(stderr, _("error in format: %s\n"), errstr); - return 1; + rpmError(RPMERR_QFMT, _("incorrect format: %s\n"), errstr); + return te; } - - fputs(str, fp); - - return 0; + te = stpcpy(te, str); + return te; } static int countLinks(int_16 * fileRdevList, int_32 * fileInodeList, int nfiles, @@ -177,19 +175,21 @@ static int countLinks(int_16 * fileRdevList, int_32 * fileInodeList, int nfiles, int showQueryPackage(QVA_t *qva, /*@unused@*/rpmdb rpmdb, Header h) { - FILE *fp = stdout; /* XXX FIXME: pass as arg */ + char buf[BUFSIZ]; + char * t, * te; + int queryFlags = qva->qva_flags; const char *queryFormat = qva->qva_queryFormat; - const char * name, * version, * release; int_32 count, type; char * prefix = NULL; - const char ** dirNames, ** baseNames; - const char ** fileMD5List; - const char * fileStatesList; + const char ** dirNames = NULL; + const char ** baseNames = NULL; + const char ** fileMD5List = NULL; const char ** fileOwnerList = NULL; const char ** fileGroupList = NULL; - const char ** fileLinktoList; + const char ** fileLinktoList = NULL; + const char * fileStatesList; int_32 * fileFlagsList, * fileMTimeList, * fileSizeList; int_32 * fileUIDList = NULL; int_32 * fileGIDList = NULL; @@ -197,169 +197,186 @@ int showQueryPackage(QVA_t *qva, /*@unused@*/rpmdb rpmdb, Header h) uint_16 * fileModeList; uint_16 * fileRdevList; int_32 * dirIndexes; + int rc = 0; /* XXX FIXME: need real return code */ int i; - headerNVR(h, &name, &version, &release); + te = t = buf; + *te = '\0'; if (!queryFormat && !queryFlags) { - fprintf(fp, "%s-%s-%s\n", name, version, release); - } else { - if (queryFormat) - queryHeader(fp, h, queryFormat); + const char * name, * version, * release; + headerNVR(h, &name, &version, &release); + te = stpcpy(te, name); + te = stpcpy( stpcpy(te, "-"), version); + te = stpcpy( stpcpy(te, "-"), release); + goto exit; + } + + if (queryFormat) + queryHeader(te, h, queryFormat); + + if (!(queryFlags & QUERY_FOR_LIST)) + goto exit; - if (queryFlags & QUERY_FOR_LIST) { - if (!headerGetEntry(h, RPMTAG_BASENAMES, &type, + if (!headerGetEntry(h, RPMTAG_BASENAMES, &type, (void **) &baseNames, &count)) { - fputs(_("(contains no files)"), fp); - fputs("\n", fp); - } else { - if (!headerGetEntry(h, RPMTAG_FILESTATES, &type, + te = stpcpy(te, _("(contains no files)")); + goto exit; + } + if (!headerGetEntry(h, RPMTAG_FILESTATES, &type, (void **) &fileStatesList, &count)) { - fileStatesList = NULL; - } - headerGetEntry(h, RPMTAG_DIRNAMES, NULL, - (void **) &dirNames, NULL); - headerGetEntry(h, RPMTAG_DIRINDEXES, NULL, - (void **) &dirIndexes, NULL); - headerGetEntry(h, RPMTAG_FILEFLAGS, &type, - (void **) &fileFlagsList, &count); - headerGetEntry(h, RPMTAG_FILESIZES, &type, - (void **) &fileSizeList, &count); - headerGetEntry(h, RPMTAG_FILEMODES, &type, - (void **) &fileModeList, &count); - headerGetEntry(h, RPMTAG_FILEMTIMES, &type, - (void **) &fileMTimeList, &count); - headerGetEntry(h, RPMTAG_FILERDEVS, &type, - (void **) &fileRdevList, &count); - headerGetEntry(h, RPMTAG_FILEINODES, &type, - (void **) &fileInodeList, &count); - headerGetEntry(h, RPMTAG_FILELINKTOS, &type, - (void **) &fileLinktoList, &count); - headerGetEntry(h, RPMTAG_FILEMD5S, &type, - (void **) &fileMD5List, &count); - - if (!headerGetEntry(h, RPMTAG_FILEUIDS, &type, + fileStatesList = NULL; + } + headerGetEntry(h, RPMTAG_DIRNAMES, NULL, (void **) &dirNames, NULL); + headerGetEntry(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL); + headerGetEntry(h, RPMTAG_FILEFLAGS, &type, (void **)&fileFlagsList, &count); + headerGetEntry(h, RPMTAG_FILESIZES, &type, (void **) &fileSizeList, &count); + headerGetEntry(h, RPMTAG_FILEMODES, &type, (void **) &fileModeList, &count); + headerGetEntry(h, RPMTAG_FILEMTIMES, &type, (void **)&fileMTimeList,&count); + headerGetEntry(h, RPMTAG_FILERDEVS, &type, (void **) &fileRdevList, &count); + headerGetEntry(h, RPMTAG_FILEINODES, &type, (void **)&fileInodeList,&count); + headerGetEntry(h, RPMTAG_FILELINKTOS,&type,(void **)&fileLinktoList,&count); + headerGetEntry(h, RPMTAG_FILEMD5S, &type, (void **) &fileMD5List, &count); + + if (!headerGetEntry(h, RPMTAG_FILEUIDS, &type, (void **) &fileUIDList, &count)) { - fileUIDList = NULL; - } else if (!headerGetEntry(h, RPMTAG_FILEGIDS, &type, + fileUIDList = NULL; + } else if (!headerGetEntry(h, RPMTAG_FILEGIDS, &type, (void **) &fileGIDList, &count)) { - fileGIDList = NULL; - } + fileGIDList = NULL; + } - if (!headerGetEntry(h, RPMTAG_FILEUSERNAME, &type, + if (!headerGetEntry(h, RPMTAG_FILEUSERNAME, &type, (void **) &fileOwnerList, &count)) { - fileOwnerList = NULL; - } else if (!headerGetEntry(h, RPMTAG_FILEGROUPNAME, &type, + fileOwnerList = NULL; + } else if (!headerGetEntry(h, RPMTAG_FILEGROUPNAME, &type, (void **) &fileGroupList, &count)) { - fileGroupList = NULL; + fileGroupList = NULL; + } + + for (i = 0; i < count; i++) { + /* If querying only docs, skip non-doc files. */ + if ((queryFlags & QUERY_FOR_DOCS) + && !(fileFlagsList[i] & RPMFILE_DOC)) + continue; + /* If querying only configs, skip non-config files. */ + if ((queryFlags & QUERY_FOR_CONFIG) + && !(fileFlagsList[i] & RPMFILE_CONFIG)) + continue; + + if (!rpmIsVerbose() && prefix) + te = stpcpy(te, prefix); + + if (queryFlags & QUERY_FOR_STATE) { + if (fileStatesList) { + switch (fileStatesList[i]) { + case RPMFILE_STATE_NORMAL: + te = stpcpy(te, _("normal ")); break; + case RPMFILE_STATE_REPLACED: + te = stpcpy(te, _("replaced ")); break; + case RPMFILE_STATE_NOTINSTALLED: + te = stpcpy(te, _("not installed ")); break; + case RPMFILE_STATE_NETSHARED: + te = stpcpy(te, _("net shared ")); break; + default: + sprintf(te, _("(unknown %3d) "), (int)fileStatesList[i]); + te += strlen(te); + break; } + } else { + te = stpcpy(te, _("(no state) ")); + } + } - for (i = 0; i < count; i++) { - if (!((queryFlags & QUERY_FOR_DOCS) || - (queryFlags & QUERY_FOR_CONFIG)) - || ((queryFlags & QUERY_FOR_DOCS) && - (fileFlagsList[i] & RPMFILE_DOC)) - || ((queryFlags & QUERY_FOR_CONFIG) && - (fileFlagsList[i] & RPMFILE_CONFIG))) { - - if (!rpmIsVerbose()) - prefix ? fputs(prefix, fp) : 0; - - if (queryFlags & QUERY_FOR_STATE) { - if (fileStatesList) { - switch (fileStatesList[i]) { - case RPMFILE_STATE_NORMAL: - fputs(_("normal "), fp); break; - case RPMFILE_STATE_REPLACED: - fputs(_("replaced "), fp); break; - case RPMFILE_STATE_NOTINSTALLED: - fputs(_("not installed "), fp); break; - case RPMFILE_STATE_NETSHARED: - fputs(_("net shared "), fp); break; - default: - fprintf(fp, _("(unknown %3d) "), - (int)fileStatesList[i]); - } - } else { - fputs( _("(no state) "), fp); - } - } - - if (queryFlags & QUERY_FOR_DUMPFILES) { - fprintf(fp, "%s%s %d %d %s 0%o ", + if (queryFlags & QUERY_FOR_DUMPFILES) { + sprintf(te, "%s%s %d %d %s 0%o ", dirNames[dirIndexes[i]], baseNames[i], fileSizeList[i], fileMTimeList[i], fileMD5List[i], fileModeList[i]); + te += strlen(te); + + if (fileOwnerList && fileGroupList) { + sprintf(te, "%s %s", fileOwnerList[i], fileGroupList[i]); + te += strlen(te); + } else if (fileUIDList && fileGIDList) { + sprintf(te, "%d %d", fileUIDList[i], fileGIDList[i]); + te += strlen(te); + } else { + rpmError(RPMERR_INTERNAL, + _("package has neither file owner or id lists")); + } - if (fileOwnerList && fileGroupList) - fprintf(fp, "%s %s", fileOwnerList[i], - fileGroupList[i]); - else if (fileUIDList && fileGIDList) - fprintf(fp, "%d %d", fileUIDList[i], - fileGIDList[i]); - else { - rpmError(RPMERR_INTERNAL, _("package has " - "neither file owner or id lists")); - } - - fprintf(fp, " %s %s %u ", + sprintf(te, " %s %s %u ", fileFlagsList[i] & RPMFILE_CONFIG ? "1" : "0", fileFlagsList[i] & RPMFILE_DOC ? "1" : "0", (unsigned)fileRdevList[i]); + te += strlen(te); + + if (strlen(fileLinktoList[i])) + sprintf(te, "%s", fileLinktoList[i]); + else + sprintf(te, "X"); + te += strlen(te); + } else if (!rpmIsVerbose()) { + te = stpcpy(te, dirNames[dirIndexes[i]]); + te = stpcpy(te, baseNames[i]); + } else { + char * filespec; + int nlink; - if (strlen(fileLinktoList[i])) - fprintf(fp, "%s\n", fileLinktoList[i]); - else - fprintf(fp, "X\n"); - - } else if (!rpmIsVerbose()) { - fputs(dirNames[dirIndexes[i]], fp); - fputs(baseNames[i], fp); - fputs("\n", fp); - } else { - char * filespec; - int nlink; - - filespec = xmalloc(strlen(dirNames[dirIndexes[i]]) + filespec = xmalloc(strlen(dirNames[dirIndexes[i]]) + strlen(baseNames[i]) + 1); - strcpy(filespec, dirNames[dirIndexes[i]]); - strcat(filespec, baseNames[i]); + strcpy(filespec, dirNames[dirIndexes[i]]); + strcat(filespec, baseNames[i]); - nlink = countLinks(fileRdevList, fileInodeList, count, i); - if (fileOwnerList && fileGroupList) { - printFileInfo(fp, filespec, fileSizeList[i], + nlink = countLinks(fileRdevList, fileInodeList, count, i); + if (fileOwnerList && fileGroupList) { + printFileInfo(te, filespec, fileSizeList[i], fileModeList[i], fileMTimeList[i], fileRdevList[i], nlink, fileOwnerList[i], fileGroupList[i], -1, -1, fileLinktoList[i]); - } else if (fileUIDList && fileGIDList) { - printFileInfo(fp, filespec, fileSizeList[i], + te += strlen(te); + } else if (fileUIDList && fileGIDList) { + printFileInfo(te, filespec, fileSizeList[i], fileModeList[i], fileMTimeList[i], fileRdevList[i], nlink, NULL, NULL, fileUIDList[i], fileGIDList[i], fileLinktoList[i]); - } else { - rpmError(RPMERR_INTERNAL, _("package has " - "neither file owner or id lists")); - } - - free(filespec); - } - } - } - - free(dirNames); - free(baseNames); - free(fileLinktoList); - free(fileMD5List); - if (fileOwnerList) free(fileOwnerList); - if (fileGroupList) free(fileGroupList); + te += strlen(te); + } else { + rpmError(RPMERR_INTERNAL, + _("package has neither file owner or id lists")); } + + free(filespec); + } + if (te > t) { + *te++ = '\n'; + *te = '\0'; + rpmMessage(RPMMESS_NORMAL, "%s", t); + te = t = buf; + *t = '\0'; } } - return 0; /* XXX FIXME: need real return code */ + + rc = 0; + +exit: + if (te > t) { + *te++ = '\n'; + *te = '\0'; + rpmMessage(RPMMESS_NORMAL, "%s", t); + } + if (dirNames) free(dirNames); + if (baseNames) free(baseNames); + if (fileLinktoList) free(fileLinktoList); + if (fileMD5List) free(fileMD5List); + if (fileOwnerList) free(fileOwnerList); + if (fileGroupList) free(fileGroupList); + return rc; } static void @@ -385,7 +402,7 @@ printNewSpecfile(Spec spec) if (msgstr) free((void *)msgstr); msgstr = headerSprintf(h, fmt, rpmTagTable, rpmHeaderFormats, &errstr); if (msgstr == NULL) { - fprintf(stderr, _("can't query %s: %s\n"), tn, errstr); + rpmError(RPMERR_QFMT, _("can't query %s: %s\n"), tn, errstr); return; } @@ -501,12 +518,13 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, fd = Fopen(argv[i], "r.ufdio"); if (Ferror(fd)) { /* XXX Fstrerror */ - fprintf(stderr, _("open of %s failed: %s\n"), argv[i], + rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), argv[i], #ifndef NOTYET - urlStrerror(argv[i])); + urlStrerror(argv[i]) #else - Fstrerror(fd)); + Fstrerror(fd) #endif + ); if (fd) Fclose(fd); retcode = 1; break; @@ -519,8 +537,8 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, switch (retcode) { case 0: if (h == NULL) { - fprintf(stderr, _("old format source packages cannot " - "be queried\n")); + rpmError(RPMERR_QUERY, + _("old format source packages cannot be queried\n")); retcode = 1; break; } @@ -528,11 +546,12 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, headerFree(h); break; case 1: - fprintf(stderr, _("%s does not appear to be a RPM package\n"), - argv[i]); + rpmError(RPMERR_QUERY, + _("%s does not appear to be a RPM package\n"), argv[i]); /*@fallthrough@*/ case 2: - fprintf(stderr, _("query of %s failed\n"), argv[i]); + rpmError(RPMERR_QUERY, + _("query of %s failed\n"), argv[i]); retcode = 1; break; } @@ -565,7 +584,8 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, cookie, anyarch, force); if (rc || spec == NULL) { - fprintf(stderr, _("query of specfile %s failed, can't parse\n"), arg); + rpmError(RPMERR_QUERY, + _("query of specfile %s failed, can't parse\n"), arg); if (spec != NULL) freeSpecVec(spec); retcode = 1; break; @@ -588,7 +608,7 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, /* RPMDBI_PACKAGES */ mi = rpmdbInitIterator(rpmdb, RPMDBI_PACKAGES, NULL, 0); if (mi == NULL) { - fprintf(stderr, _("no packages\n")); + rpmError(RPMERR_QUERY, _("no packages\n")); retcode = 1; } else { retcode = showMatches(qva, mi, showPackage); @@ -598,7 +618,8 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, case RPMQV_GROUP: mi = rpmdbInitIterator(rpmdb, RPMTAG_GROUP, arg, 0); if (mi == NULL) { - fprintf(stderr, _("group %s does not contain any packages\n"), arg); + rpmError(RPMERR_QUERY, + _("group %s does not contain any packages\n"), arg); retcode = 1; } else { retcode = showMatches(qva, mi, showPackage); @@ -608,7 +629,7 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, case RPMQV_TRIGGEREDBY: mi = rpmdbInitIterator(rpmdb, RPMTAG_TRIGGERNAME, arg, 0); if (mi == NULL) { - fprintf(stderr, _("no package triggers %s\n"), arg); + rpmError(RPMERR_QUERY, _("no package triggers %s\n"), arg); retcode = 1; } else { retcode = showMatches(qva, mi, showPackage); @@ -618,7 +639,7 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, case RPMQV_WHATREQUIRES: mi = rpmdbInitIterator(rpmdb, RPMTAG_REQUIRENAME, arg, 0); if (mi == NULL) { - fprintf(stderr, _("no package requires %s\n"), arg); + rpmError(RPMERR_QUERY, _("no package requires %s\n"), arg); retcode = 1; } else { retcode = showMatches(qva, mi, showPackage); @@ -629,7 +650,7 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, if (arg[0] != '/') { mi = rpmdbInitIterator(rpmdb, RPMTAG_PROVIDENAME, arg, 0); if (mi == NULL) { - fprintf(stderr, _("no package provides %s\n"), arg); + rpmError(RPMERR_QUERY, _("no package provides %s\n"), arg); retcode = 1; } else { retcode = showMatches(qva, mi, showPackage); @@ -659,10 +680,12 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, myerrno = errno; switch (myerrno) { default: - fprintf(stderr, _("file %s: %s\n"), fn, strerror(myerrno)); + rpmError(RPMERR_QUERY, + _("file %s: %s\n"), fn, strerror(myerrno)); break; case 0: - fprintf(stderr, _("file %s is not owned by any package\n"), fn); + rpmError(RPMERR_QUERY, + _("file %s is not owned by any package\n"), fn); break; } retcode = 1; @@ -688,14 +711,15 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, } recOffset = strtoul(myarg, &end, mybase); if ((*end) || (end == arg) || (recOffset == ULONG_MAX)) { - fprintf(stderr, _("invalid package number: %s\n"), arg); + rpmError(RPMERR_QUERY, _("invalid package number: %s\n"), arg); return 1; } rpmMessage(RPMMESS_DEBUG, _("package record number: %u\n"), recOffset); /* RPMDBI_PACKAGES */ mi = rpmdbInitIterator(rpmdb, RPMDBI_PACKAGES, &recOffset, sizeof(recOffset)); if (mi == NULL) { - fprintf(stderr, _("record %d could not be read\n"), recOffset); + rpmError(RPMERR_QUERY, + _("record %d could not be read\n"), recOffset); retcode = 1; } else { retcode = showMatches(qva, mi, showPackage); @@ -706,7 +730,7 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg, /* XXX HACK to get rpmdbFindByLabel out of the API */ mi = rpmdbInitIterator(rpmdb, RPMDBI_LABEL, arg, 0); if (mi == NULL) { - fprintf(stderr, _("package %s is not installed\n"), arg); + rpmError(RPMERR_QUERY, _("package %s is not installed\n"), arg); retcode = 1; } else { retcode = showMatches(qva, mi, showPackage); diff --git a/lib/rpmlib.h b/lib/rpmlib.h index b8070e0..7b01eca 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -101,6 +101,8 @@ int rpmHeaderGetEntry(Header h, int_32 tag, /*@out@*/ int_32 *type, * Retrieve tag info from header. * Yet Another "dressed" entry to headerGetEntry in order to unify * signature/header tag retrieval. + * @deprecated Signature tags are now duplicated into header when installed. + * @todo Eliminate from API. * @param leadp rpm lead * @param h header * @param sigs signatures @@ -169,7 +171,7 @@ typedef enum rpmTag_e { RPMTAG_VERSION = 1001, RPMTAG_RELEASE = 1002, RPMTAG_EPOCH = 1003, -#define RPMTAG_SERIAL RPMTAG_EPOCH /* backward comaptibility */ +#define RPMTAG_SERIAL RPMTAG_EPOCH /* backward comaptibility */ RPMTAG_SUMMARY = 1004, RPMTAG_DESCRIPTION = 1005, RPMTAG_BUILDTIME = 1006, @@ -1158,7 +1160,7 @@ extern struct poptOption rpmBuildPoptTable[]; /** \ingroup rpmcli * Bit(s) for rpmVerifyFile() attributes and result. */ -enum rpmVerifyAttrs_e { +typedef enum rpmVerifyAttrs_e { RPMVERIFY_NONE = 0, /*!< */ RPMVERIFY_MD5 = (1 << 0), /*!< */ RPMVERIFY_FILESIZE = (1 << 1), /*!< */ @@ -1171,12 +1173,13 @@ enum rpmVerifyAttrs_e { RPMVERIFY_READLINKFAIL= (1 << 28), /*!< */ RPMVERIFY_READFAIL = (1 << 29), /*!< */ RPMVERIFY_LSTATFAIL = (1 << 30) /*!< */ -}; +} rpmVerifyAttrs; #define RPMVERIFY_ALL ~(RPMVERIFY_NONE) /** \ingroup rpmcli * Verify file attributes and MD5 sum. - * @todo python bindings prevent this from being static. + * @todo gnorpm and python bindings prevent this from being static. + * @todo add rpmVerifyAttrs to prototype. * @param root path to top of install tree * @param h header * @param filenum index of file in header file info arrays @@ -1189,14 +1192,13 @@ int rpmVerifyFile(const char * root, Header h, int filenum, /** * Return exit code from running verify script in header. - * @todo kpackage prevents static, should be using VERIFY_SCRIPT flag. + * @todo gnorpm/kpackage prevents static, should be using VERIFY_SCRIPT flag. * @param rootDir path to top of install tree - * @param rpmdb rpm database * @param h header - * @param scriptFd file handle to use for stderr + * @param scriptFd file handle to use for stderr (or NULL) * @return 0 on success */ -int rpmVerifyScript(const char * rootDir, rpmdb rpmdb, Header h, FD_t scriptFd); +int rpmVerifyScript(const char * rootDir, Header h, FD_t scriptFd); /** \ingroup rpmcli * The command line argument will be used to retrieve header(s) ... diff --git a/lib/verify.c b/lib/verify.c index 4169f4c..eeb9da2 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -46,11 +46,12 @@ struct poptOption rpmVerifyPoptTable[] = { }; /* ======================================================================== */ -int rpmVerifyFile(const char * prefix, Header h, int filenum, int * result, - int omitMask) +int rpmVerifyFile(const char * prefix, Header h, int filenum, + int * result, int omitMask) { char ** baseNames, ** md5List, ** linktoList, ** dirNames; - int_32 * verifyFlags, flags; + int_32 * verifyFlags; + rpmVerifyAttrs flags; int_32 * sizeList, * mtimeList, * dirIndexes; unsigned short * modeList, * rdevList; char * fileStatesList; @@ -244,19 +245,20 @@ int rpmVerifyFile(const char * prefix, Header h, int filenum, int * result, /** * Return exit code from running verify script in header. - * @todo kpackage prevents static, should be using VERIFY_SCRIPT flag. + * @todo gnorpm/kpackage prevents static, should be using VERIFY_SCRIPT flag. * @param rootDir path to top of install tree - * @param rpmdb rpm database * @param h header - * @param scriptFd file handle to use for stderr + * @param scriptFd file handle to use for stderr (or NULL) * @return 0 on success */ -int rpmVerifyScript(const char * rootDir, rpmdb rpmdb, Header h, FD_t scriptFd) +int rpmVerifyScript(const char * rootDir, Header h, FD_t scriptFd) { + rpmdb rpmdb = NULL; rpmTransactionSet ts = rpmtransCreateSet(rpmdb, rootDir); int rc; - ts->scriptFd = fdLink(scriptFd, "rpmVerifyScript"); + if (scriptFd) + ts->scriptFd = fdLink(scriptFd, "rpmVerifyScript"); rc = runInstScript(ts, h, RPMTAG_VERIFYSCRIPT, RPMTAG_VERIFYSCRIPTPROG, 0, 0); rpmtransFree(ts); @@ -266,32 +268,44 @@ int rpmVerifyScript(const char * rootDir, rpmdb rpmdb, Header h, FD_t scriptFd) /* ======================================================================== */ static int verifyHeader(QVA_t *qva, Header h) { - const char ** fileNames; + char buf[BUFSIZ]; + char * t, * te; + + const char ** fileNames = NULL; int count; - int verifyResult; - int i, ec, rc; - int_32 * fileFlagsList; - int omitMask = 0; - - ec = 0; - if (!(qva->qva_flags & VERIFY_MD5)) omitMask = RPMVERIFY_MD5; - - if (headerGetEntry(h, RPMTAG_FILEFLAGS, NULL, (void **) &fileFlagsList, NULL) && - headerIsEntry(h, RPMTAG_BASENAMES)) { - rpmBuildFileList(h, &fileNames, &count); - - for (i = 0; i < count; i++) { - if ((rc = rpmVerifyFile(qva->qva_prefix, h, i, &verifyResult, omitMask)) != 0) { - fprintf(stdout, _("missing %s\n"), fileNames[i]); - } else { - const char * size, * md5, * link, * mtime, * mode; - const char * group, * user, * rdev; - /*@observer@*/ static const char *const aok = "."; - /*@observer@*/ static const char *const unknown = "?"; - - if (!verifyResult) continue; - - rc = 1; + int_32 * fileFlagsList = NULL; + rpmVerifyAttrs verifyResult = 0; + rpmVerifyAttrs omitMask = !(qva->qva_flags & VERIFY_MD5) + ? RPMVERIFY_MD5 : RPMVERIFY_NONE; + int ec = 0; + int i; + + te = t = buf; + *te = '\0'; + + if (!headerGetEntry(h, RPMTAG_FILEFLAGS, NULL, (void **) &fileFlagsList, NULL)) + goto exit; + + if (!headerIsEntry(h, RPMTAG_BASENAMES)) + goto exit; + + rpmBuildFileList(h, &fileNames, &count); + + for (i = 0; i < count; i++) { + int rc; + + rc = rpmVerifyFile(qva->qva_prefix, h, i, &verifyResult, omitMask); + if (rc) { + sprintf(te, _("missing %s"), fileNames[i]); + te += strlen(te); + ec = rc; + } else if (verifyResult) { + const char * size, * md5, * link, * mtime, * mode; + const char * group, * user, * rdev; + /*@observer@*/ static const char *const aok = "."; + /*@observer@*/ static const char *const unknown = "?"; + + ec = 1; #define _verify(_RPMVERIFY_F, _C) \ ((verifyResult & _RPMVERIFY_F) ? _C : aok) @@ -302,38 +316,46 @@ static int verifyHeader(QVA_t *qva, Header h) ((verifyResult & RPMVERIFY_READFAIL) ? unknown : \ (verifyResult & _RPMVERIFY_F) ? _C : aok) - md5 = _verifyfile(RPMVERIFY_MD5, "5"); - size = _verify(RPMVERIFY_FILESIZE, "S"); - link = _verifylink(RPMVERIFY_LINKTO, "L"); - mtime = _verify(RPMVERIFY_MTIME, "T"); - rdev = _verify(RPMVERIFY_RDEV, "D"); - user = _verify(RPMVERIFY_USER, "U"); - group = _verify(RPMVERIFY_GROUP, "G"); - mode = _verify(RPMVERIFY_MODE, "M"); + md5 = _verifyfile(RPMVERIFY_MD5, "5"); + size = _verify(RPMVERIFY_FILESIZE, "S"); + link = _verifylink(RPMVERIFY_LINKTO, "L"); + mtime = _verify(RPMVERIFY_MTIME, "T"); + rdev = _verify(RPMVERIFY_RDEV, "D"); + user = _verify(RPMVERIFY_USER, "U"); + group = _verify(RPMVERIFY_GROUP, "G"); + mode = _verify(RPMVERIFY_MODE, "M"); #undef _verify #undef _verifylink #undef _verifyfile - fprintf(stdout, "%s%s%s%s%s%s%s%s %c %s\n", + sprintf(te, "%s%s%s%s%s%s%s%s %c %s", size, mode, md5, rdev, link, user, group, mtime, fileFlagsList[i] & RPMFILE_CONFIG ? 'c' : ' ', fileNames[i]); - } - if (rc) - ec = rc; + te += strlen(te); + } + + if (te > t) { + *te++ = '\n'; + *te = '\0'; + rpmMessage(RPMMESS_NORMAL, "%s", t); + te = t = buf; + *t = '\0'; } - - free(fileNames); } + +exit: + if (fileNames) free(fileNames); return ec; } -static int verifyDependencies(rpmdb rpmdb, Header h) { +static int verifyDependencies(rpmdb rpmdb, Header h) +{ rpmTransactionSet rpmdep; struct rpmDependencyConflict * conflicts; int numConflicts; - const char * name, * version, * release; + int rc = 0; int i; rpmdep = rpmtransCreateSet(rpmdb, NULL); @@ -343,22 +365,45 @@ static int verifyDependencies(rpmdb rpmdb, Header h) { rpmtransFree(rpmdep); if (numConflicts) { + const char * name, * version, * release; + char * t, * te; + int nb = 512; headerNVR(h, &name, &version, &release); - fprintf(stdout, _("Unsatisfied dependencies for %s-%s-%s: "), + + for (i = 0; i < numConflicts; i++) { + nb += strlen(conflicts[i].needsName) + sizeof(", ") - 1; + if (conflicts[i].needsFlags) + nb += strlen(conflicts[i].needsVersion) + 5; + } + te = t = alloca(nb); + *te = '\0'; + sprintf(te, _("Unsatisfied dependencies for %s-%s-%s: "), name, version, release); + te += strlen(te); for (i = 0; i < numConflicts; i++) { - if (i) fprintf(stdout, ", "); - fprintf(stdout, "%s", conflicts[i].needsName); + if (i) te = stpcpy(te, ", "); + te = stpcpy(te, conflicts[i].needsName); if (conflicts[i].needsFlags) { - printDepFlags(stdout, conflicts[i].needsVersion, - conflicts[i].needsFlags); + int flags = conflicts[i].needsFlags; + *te++ = ' '; + if (flags & RPMSENSE_LESS) *te++ = '<'; + if (flags & RPMSENSE_GREATER) *te++ = '>'; + if (flags & RPMSENSE_EQUAL) *te++ = '='; + *te++ = ' '; + te = stpcpy(te, conflicts[i].needsVersion); } } - fprintf(stdout, "\n"); rpmdepFreeConflicts(conflicts, numConflicts); - return 1; + if (te > t) { + *te++ = '\n'; + *te = '\0'; + rpmMessage(RPMMESS_NORMAL, "%s", t); + te = t; + *t = '\0'; + } + rc = 1; } - return 0; + return rc; } int showVerifyPackage(QVA_t *qva, rpmdb rpmdb, Header h) @@ -375,7 +420,7 @@ int showVerifyPackage(QVA_t *qva, rpmdb rpmdb, Header h) ec = rc;; fdo = fdDup(STDOUT_FILENO); if ((qva->qva_flags & VERIFY_SCRIPT) && - (rc = rpmVerifyScript(qva->qva_prefix, rpmdb, h, fdo)) != 0) + (rc = rpmVerifyScript(qva->qva_prefix, h, fdo)) != 0) ec = rc; Fclose(fdo); return ec; diff --git a/po/cs.po b/po/cs.po index 0f5b0e8..00fc22a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 2000-08-23 22:24+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -2703,13 +2703,13 @@ msgid " file: %s action: %s\n" msgstr " soubor: %s akce: %s\n" #: lib/install.c:215 -#, c-format -msgid "user %s does not exist - using root" +#, fuzzy, c-format +msgid "user %s does not exist - using root\n" msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root" #: lib/install.c:223 -#, c-format -msgid "group %s does not exist - using root" +#, fuzzy, c-format +msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root" #. this would probably be a good place to check if disk space @@ -2791,12 +2791,12 @@ msgstr "p #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "varování: %s vytvoøeno jako %s" #: lib/install.c:1098 #, fuzzy, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "varování: %s ulo¾eno jako %s" #: lib/install.c:1189 @@ -3051,123 +3051,123 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s-%s-%s" #: lib/query.c:151 -#, c-format -msgid "error in format: %s\n" +#, fuzzy, c-format +msgid "incorrect format: %s\n" msgstr "chyba ve formátu: %s\n" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "(neobsahuje ¾ádné soubory)" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "normální " -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "nahrazen " -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "neinstalován " -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "sdílen v síti " -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "(neznámý %3d) " -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "(chybí stav) " -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "balíèek nemá vlastníka souboru ani seznamy id" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "nelze provést dotaz na zdrojové balíèky starého formátu\n" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "nezdá se, ¾e by %s byl balíèek typu RPM\n" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "dotaz na %s se nezdaøil\n" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "¾ádné balíèky\n" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s neobsahuje ¾ádné balíèky\n" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "¾ádný balíèek neaktivuje %s\n" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "¾ádný balíèek nevy¾aduje %s\n" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "¾ádný balíèek neposkytuje %s\n" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "soubor %s: %s\n" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "soubor %s nevlastní ¾ádný balíèek\n" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "neplatné èíslo balíèku: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "záznam balíèku èíslo: %u\n" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "záznam %d nelze pøeèíst\n" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" @@ -3876,23 +3876,23 @@ msgstr "proveden msgid "don't verify files in package" msgstr "nekontrolovat soubory v balíèku" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" "balíèek neobsahuje ani u¾ivatelská jména ani seznam id (nemìlo by se nikdy " "stát)" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" "balíèek neobsahuje ani jména skupin ani seznam id (nemìlo by se nikdy stát)" -#: lib/verify.c:285 -#, c-format -msgid "missing %s\n" +#: lib/verify.c:299 +#, fuzzy, c-format +msgid "missing %s" msgstr "chybí %s\n" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " diff --git a/po/da.po b/po/da.po index 2b3576c..3b418cf 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" @@ -2663,12 +2663,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2749,13 +2749,13 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 -#, c-format -msgid "%s saved as %s" -msgstr "" +#, fuzzy, c-format +msgid "%s saved as %s\n" +msgstr " ... som %s\n" #: lib/install.c:1189 msgid "running postinstall scripts (if any)\n" @@ -3010,122 +3010,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "ingen pakker\n" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "fil %s: %s\n" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "ugyldig pakkenummer: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3807,20 +3807,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/de.po b/po/de.po index cb4af60..4411d68 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -2912,13 +2912,13 @@ msgstr " #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 -#, c-format -msgid "group %s does not exist - using root" -msgstr "" +#, fuzzy, c-format +msgid "group %s does not exist - using root\n" +msgstr "Gruppe %s beinhaltet kein einziges Paket\n" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error @@ -3003,13 +3003,13 @@ msgstr "Fehler: #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "kann Datei %s nicht öffnen: " #: lib/install.c:1098 -#, c-format -msgid "%s saved as %s" -msgstr "" +#, fuzzy, c-format +msgid "%s saved as %s\n" +msgstr "kann Datei %s nicht öffnen: " #: lib/install.c:1189 msgid "running postinstall scripts (if any)\n" @@ -3300,127 +3300,127 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/query.c:151 -#, c-format -msgid "error in format: %s\n" +#, fuzzy, c-format +msgid "incorrect format: %s\n" msgstr "Fehler beim Format %s\n" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "(beinhaltet keine Dateien)" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 #, fuzzy msgid "not installed " msgstr "Paket %s ist nicht installiert\n" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, fuzzy, c-format msgid "(unknown %3d) " msgstr "(unbekannter Typ)" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s scheint kein RPM-Paket zu sein\n" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "Anfrage von %s fehlgeschlagen\n" -#: lib/query.c:568 +#: lib/query.c:588 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "Anfrage von %s fehlgeschlagen\n" -#: lib/query.c:591 +#: lib/query.c:611 #, fuzzy msgid "no packages\n" msgstr "Anfrage an alle Pakete" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "kein Paket triggert %s\n" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "kein Paket verlangt %s\n" # oder besser: ... listet %s auf? -ke- -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "kein Paket stellt %s bereit\n" # , c-format -#: lib/query.c:662 +#: lib/query.c:684 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "ungültige Paket-Nummer: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "ungültige Paket-Nummer: %s\n" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -4132,20 +4132,20 @@ msgstr "Ausf msgid "don't verify files in package" msgstr "Paket installieren" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, fuzzy, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "fehlende { nach %{" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " diff --git a/po/es.po b/po/es.po index 7033298..376aa0a 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,12 +2630,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2716,12 +2716,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2977,122 +2977,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3774,20 +3774,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/fi.po b/po/fi.po index c49ea8f..1a59f78 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -2832,13 +2832,13 @@ msgstr "en voinut avata %s: %s" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 -#, c-format -msgid "group %s does not exist - using root" -msgstr "" +#, fuzzy, c-format +msgid "group %s does not exist - using root\n" +msgstr "ryhmässä %s ei ole paketteja\n" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error @@ -2921,13 +2921,13 @@ msgstr "virhe: ohitan %s:n, siirto ep #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "en voinut avata tiedostoa %s: " #: lib/install.c:1098 -#, c-format -msgid "%s saved as %s" -msgstr "" +#, fuzzy, c-format +msgid "%s saved as %s\n" +msgstr "en voinut avata tiedostoa %s: " #: lib/install.c:1189 msgid "running postinstall scripts (if any)\n" @@ -3213,125 +3213,125 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/query.c:151 -#, c-format -msgid "error in format: %s\n" +#, fuzzy, c-format +msgid "incorrect format: %s\n" msgstr "virhe formaatissa: %s\n" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "(ei tiedostoja)" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 #, fuzzy msgid "not installed " msgstr "paketti %s ei ole asennettu\n" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, fuzzy, c-format msgid "(unknown %3d) " msgstr "(tuntematon tyyppi)" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ei vaikuta RPM-paketilta\n" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "%s:n kysely ei onnistunut\n" -#: lib/query.c:568 +#: lib/query.c:588 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "%s:n kysely ei onnistunut\n" -#: lib/query.c:591 +#: lib/query.c:611 #, fuzzy msgid "no packages\n" msgstr "kysele kaikki paketit" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "mikään paketti ei laukaise %s:a\n" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "mikään pakettie ei tarvitse %s:a\n" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "mikään paketti ei tarjoa %s:a\n" -#: lib/query.c:662 +#: lib/query.c:684 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -4031,20 +4031,20 @@ msgstr "skriptin ajo ep msgid "don't verify files in package" msgstr "asenna paketti" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, fuzzy, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "puuttuva '{' '%':n jälkeen" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" diff --git a/po/fr.po b/po/fr.po index 833c4c7..f62c2ab 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2000-12-21 15:42-0500\n" +msgstr "POT-Creation-Date: 2000-12-25 08:50-0500\n" #: build.c:26 #, fuzzy, c-format @@ -2837,12 +2837,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2925,13 +2925,13 @@ msgstr "" #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "impossible d'ouvrir: %s\n" #: lib/install.c:1098 -#, c-format -msgid "%s saved as %s" -msgstr "" +#, fuzzy, c-format +msgid "%s saved as %s\n" +msgstr "impossible d'ouvrir: %s\n" #: lib/install.c:1189 msgid "running postinstall scripts (if any)\n" @@ -3218,124 +3218,124 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 #, fuzzy msgid "not installed " msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a échoué.\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 #, fuzzy msgid "no packages\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, fuzzy, c-format msgid "no package triggers %s\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a été spécifié pour l'installation" @@ -4025,20 +4025,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/gl.po b/po/gl.po index 7033298..376aa0a 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,12 +2630,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2716,12 +2716,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2977,122 +2977,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3774,20 +3774,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/hu.po b/po/hu.po index 7033298..376aa0a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,12 +2630,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2716,12 +2716,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2977,122 +2977,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3774,20 +3774,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/id.po b/po/id.po index 7033298..376aa0a 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,12 +2630,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2716,12 +2716,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2977,122 +2977,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3774,20 +3774,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/is.po b/po/is.po index 8b2e628..3f81720 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 2000-08-02 13:00+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -2659,12 +2659,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2745,13 +2745,13 @@ msgstr "" #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "gat ekki búið til %s: %s\n" #: lib/install.c:1098 -#, c-format -msgid "%s saved as %s" -msgstr "" +#, fuzzy, c-format +msgid "%s saved as %s\n" +msgstr "gat ekki búið til %s: %s\n" #: lib/install.c:1189 msgid "running postinstall scripts (if any)\n" @@ -3006,122 +3006,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3803,20 +3803,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/it.po b/po/it.po index 7033298..376aa0a 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,12 +2630,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2716,12 +2716,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2977,122 +2977,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3774,20 +3774,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/ja.po b/po/ja.po index 67529ab..c03e78c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -88,7 +88,7 @@ msgstr " # build root [BuildRoot] # net share [¥Í¥Ã¥È¶¦Í­] # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë] -# $Id: ja.po,v 1.130 2000/12/21 21:07:43 jbj Exp $ +# $Id: ja.po,v 1.131 2000/12/26 13:10:20 jbj Exp $ #: rpm.c:185 rpmqv.c:269 #, c-format msgid "rpm: %s\n" @@ -2782,13 +2782,13 @@ msgid " file: %s action: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: ¥¢¥¯¥·¥ç¥ó: %s\n" #: lib/install.c:215 -#, c-format -msgid "user %s does not exist - using root" +#, fuzzy, c-format +msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" #: lib/install.c:223 -#, c-format -msgid "group %s does not exist - using root" +#, fuzzy, c-format +msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" #. this would probably be a good place to check if disk space @@ -2871,12 +2871,12 @@ msgstr "%s #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤¹" #: lib/install.c:1098 #, fuzzy, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Þ¤¹" #: lib/install.c:1189 @@ -3173,124 +3173,124 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Þ¤·¤¿" #: lib/query.c:151 -#, c-format -msgid "error in format: %s\n" +#, fuzzy, c-format +msgid "incorrect format: %s\n" msgstr "¥Õ¥©¡¼¥Þ¥Ã¥ÈÃæ¤Î¥¨¥é¡¼: %s\n" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "Ä̾ï" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "ÃÖ¤­´¹¤¨¤é¤ì¤Æ¤¤¤Þ¤¹" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "¥Í¥Ã¥È¶¦Í­" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "(̤ÃΤΠ%3d)" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "(²¿¤Î¾õÂ֤⤢¤ê¤Þ¤»¤ó)" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êÍ­¼Ô¤ä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ý¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: lib/query.c:388 +#: lib/query.c:405 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/query.c:568 +#: lib/query.c:588 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡¢¥Ñ¡¼¥¹¤Ç¤­¤Þ¤»¤ó\n" -#: lib/query.c:591 +#: lib/query.c:611 #, fuzzy msgid "no packages\n" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "¥°¥ë¡¼¥× %s ¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "%s ¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "%s ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â°¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -3991,24 +3991,24 @@ msgstr " msgid "don't verify files in package" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸¤Ï ¥æ¡¼¥¶Ì¾¤È id " "¥ê¥¹¥È¤ÎξÊý¤¬·ç¤±¤Æ¤¤¤Þ¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ¤Ï¤Ê¤é¤Ê¤¤)" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥°¥ë¡¼¥×̾¤È id " "¥ê¥¹¥È¤ÎξÊý¤¬·ç¤±¤Æ¤¤¤Þ¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ¤Ï¤Ê¤é¤Ê¤¤)" -#: lib/verify.c:285 -#, c-format -msgid "missing %s\n" +#: lib/verify.c:299 +#, fuzzy, c-format +msgid "missing %s" msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" diff --git a/po/ko.po b/po/ko.po index 7033298..376aa0a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,12 +2630,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2716,12 +2716,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2977,122 +2977,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3774,20 +3774,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/no.po b/po/no.po index 890670a..1cfead3 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 2000-08-17 20:22+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -2679,12 +2679,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2765,13 +2765,13 @@ msgstr "" #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "kunne ikke opprette %s: %s\n" #: lib/install.c:1098 -#, c-format -msgid "%s saved as %s" -msgstr "" +#, fuzzy, c-format +msgid "%s saved as %s\n" +msgstr "kunne ikke opprette %s: %s\n" #: lib/install.c:1189 msgid "running postinstall scripts (if any)\n" @@ -3026,122 +3026,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3824,20 +3824,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 -#, c-format -msgid "missing %s\n" -msgstr "" +#: lib/verify.c:299 +#, fuzzy, c-format +msgid "missing %s" +msgstr "mangler andre ':' ved %s:%d" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/pl.po b/po/pl.po index 391241b..25db9e9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -2786,13 +2786,13 @@ msgid " file: %s action: %s\n" msgstr " plik: %s akcja: %s\n" #: lib/install.c:215 -#, c-format -msgid "user %s does not exist - using root" +#, fuzzy, c-format +msgid "user %s does not exist - using root\n" msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root" #: lib/install.c:223 -#, c-format -msgid "group %s does not exist - using root" +#, fuzzy, c-format +msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" #. this would probably be a good place to check if disk space @@ -2874,12 +2874,12 @@ msgstr "%s pomijany - transmisja %s nie powiod #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "ostrze¿enie: %s utworzony jako %s" #: lib/install.c:1098 #, fuzzy, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "ostrze¿enie: %s zapisany jako %s" #: lib/install.c:1189 @@ -3155,124 +3155,124 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "wyst±pi³ nieznany b³±d %d w trakcie manipulowania pakietem %s-%s-%s" #: lib/query.c:151 -#, c-format -msgid "error in format: %s\n" +#, fuzzy, c-format +msgid "incorrect format: %s\n" msgstr "b³±d w formacie: %s\n" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "(nie zawiera plików)" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "normalny " -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "zast±piony " -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "niezainstalowany" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "udostêpniony w sieci" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "(nieznany %3d)" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "(brak statusu)" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "pakiet nie ma ani w³a¶ciciela pliku ani list id" -#: lib/query.c:388 +#: lib/query.c:405 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s nie wygl±da na pakiet RPM\n" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "odpytywanie %s nie powiod³o siê\n" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "odpytywanie pliku spec %s nie powiod³o siê, nie mo¿na interpretowaæ\n" -#: lib/query.c:591 +#: lib/query.c:611 #, fuzzy msgid "no packages\n" msgstr "znaleziono %d pakietów\n" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupa %s nie zawiera ¿adnych pakietów\n" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "¿aden pakiet nie zahacza %s\n" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "¿aden pakiet nie wymaga %s\n" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "¿aden pakiet nie udostêpnia %s\n" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "plik %s: %s\n" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "b³êdny numer pakietu: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "numer rekordu pakietu: %d\n" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -3961,24 +3961,24 @@ msgstr "wykonanie skryptu nie powiod msgid "don't verify files in package" msgstr "nie sprawdzaj plików pakietu" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" "pakiet nie specyfikuje ani nazwy u¿ytkownika ani list id (to nie powinno siê " "zdarzyæ)" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" "pakiet nie specyfikuje ani nazwy grupy ani list id (to nie powinno siê " "zdarzyæ)" -#: lib/verify.c:285 -#, c-format -msgid "missing %s\n" +#: lib/verify.c:299 +#, fuzzy, c-format +msgid "missing %s" msgstr "brak %s\n" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " diff --git a/po/pt.po b/po/pt.po index 669d205..6f830e9 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 2000-08-01 21:11+01:00\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -2627,12 +2627,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2713,12 +2713,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2974,122 +2974,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3775,20 +3775,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 596029d..32ba518 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-12-21 15:42-0500\n" +msgstr "POT-Creation-Date: 2000-12-25 08:50-0500\n" # , c-format #: build.c:26 @@ -2912,12 +2912,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -3004,13 +3004,14 @@ msgstr "" # , c-format #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "Não consegui abrir: %s\n" +# , c-format #: lib/install.c:1098 -#, c-format -msgid "%s saved as %s" -msgstr "" +#, fuzzy, c-format +msgid "%s saved as %s\n" +msgstr "Não consegui abrir: %s\n" #: lib/install.c:1189 msgid "running postinstall scripts (if any)\n" @@ -3291,125 +3292,125 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 #, fuzzy msgid "not installed " msgstr "não foi passado pacote para instalação" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" # , c-format -#: lib/query.c:388 +#: lib/query.c:405 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "Não consegui abrir: %s\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construção falhou.\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 #, fuzzy msgid "no packages\n" msgstr "pesquise todos os pacotes" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, fuzzy, c-format msgid "no package triggers %s\n" msgstr "não foram passados pacotes para assinatura" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "não foi passado pacote para instalação" @@ -4157,20 +4158,20 @@ msgstr "" msgid "don't verify files in package" msgstr "instale pacote" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/ro.po b/po/ro.po index 2a66ecb..d0bc4bc 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -2625,12 +2625,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2711,12 +2711,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2972,122 +2972,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3769,20 +3769,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 01d6816..73a681c 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-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,12 +2630,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2716,12 +2716,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2977,122 +2977,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3774,20 +3774,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/ru.po b/po/ru.po index e859c35..5f5ce1b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 2000-08-08 01:20+0300\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -2719,13 +2719,13 @@ msgid " file: %s action: %s\n" msgstr "ÆÁÊÌ : %s ÄÅÊÓÔ×ÉÅ: %s\n" #: lib/install.c:215 -#, c-format -msgid "user %s does not exist - using root" +#, fuzzy, c-format +msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ, ÉÓÐÏÌØÚÕÅÔÓÑ root" #: lib/install.c:223 -#, c-format -msgid "group %s does not exist - using root" +#, fuzzy, c-format +msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ, ÉÓÐÏÌØÚÕÅÔÓÑ root" #. this would probably be a good place to check if disk space @@ -2807,12 +2807,12 @@ msgstr "%s #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "×ÎÉÍÁÎÉÅ: %s ÓÏÚÄÁÎ ËÁË %s" #: lib/install.c:1098 #, fuzzy, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "×ÎÉÍÁÎÉÅ: %s ÓÏÈÒÁÎÅÎ ËÁË %s" #: lib/install.c:1189 @@ -3067,123 +3067,123 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ÐÒÉ ÒÁÂÏÔÅ Ó ÐÁËÅÔÏÍ %s-%s-%s" #: lib/query.c:151 -#, c-format -msgid "error in format: %s\n" +#, fuzzy, c-format +msgid "incorrect format: %s\n" msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "(ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÏ×)" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "ÎÏÒÍÁÌØÎÙÊ " -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "ÚÁÍÅÎÅÎÎÙÊ " -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎ " -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "ÓÅÔÅ×ÏÊ " -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "(ÎÅÉÚ×. %3d) " -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "(ÓÏÓÔ. ÎÅÔ) " -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓÐÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "ÚÁÐÒÏÓÙ Ë SRPM × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ÎÅ ÐÏÈÏÖ ÎÁ ÐÁËÅÔ RPM...\n" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "ÏÛÉÂËÁ ÚÁÐÒÏÓÁ %s\n" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "ÚÁÐÒÏÓ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ %s ÎÅ ÕÄÁÌÓÑ, ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÏÂÒÁÔØ ÆÁÊÌ\n" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÏÄÅÒÖÉÔ ÎÉËÁËÉÈ ÐÁËÅÔÏ×\n" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÔÒÅÂÕÅÔ %s\n" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ %s\n" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "ÆÁÊÌ %s: %s\n" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÁËÅÔÁ: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "ÎÏÍÅÒ ÚÁÐÉÓÉ ÐÁËÅÔÁ: %u\n" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "ÚÁÐÉÓØ %d ÎÅ ÞÉÔÁÅÔÓÑ\n" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -3899,20 +3899,20 @@ msgstr " msgid "don't verify files in package" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÐÁËÅÔÁ" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "× ÐÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÐÏÌØÚÏ×ÁÔÅÌÅÊ, ÎÉ ÉÈ ID (ÔÁË ÎÅ ÄÏÌÖÎÏ ÂÙÔØ)" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "× ÐÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÇÒÕÐÐ, ÎÉ ÉÈ ID (ÔÁË ÎÅ ÄÏÌÖÎÏ ÂÙÔØ)" -#: lib/verify.c:285 -#, c-format -msgid "missing %s\n" +#: lib/verify.c:299 +#, fuzzy, c-format +msgid "missing %s" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s\n" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " diff --git a/po/sk.po b/po/sk.po index 92c11d6..76750c8 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -2795,13 +2795,13 @@ msgid " file: %s action: %s\n" msgstr " súbor: akcia %s: %s\n" #: lib/install.c:215 -#, c-format -msgid "user %s does not exist - using root" +#, fuzzy, c-format +msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" #: lib/install.c:223 -#, c-format -msgid "group %s does not exist - using root" +#, fuzzy, c-format +msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" #. this would probably be a good place to check if disk space @@ -2883,12 +2883,12 @@ msgstr "%s vynechan #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "varovanie: %s vytvorené ako %s" #: lib/install.c:1098 #, fuzzy, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "varovanie: %s uchovaný ako %s" #: lib/install.c:1189 @@ -3163,124 +3163,124 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/query.c:151 -#, c-format -msgid "error in format: %s\n" +#, fuzzy, c-format +msgid "incorrect format: %s\n" msgstr "chyba formátu: %s\n" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "(neobsahuje ¾iadne súbory)" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "normálny " -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "nahradený " -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "nein¹talovaný " -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "zdieµaný " -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "(neznámy %d) " -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "(¾iadny stav) " -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií" -#: lib/query.c:388 +#: lib/query.c:405 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "nie je mo¾né pýta» sa zdrojových balíkov v starom formáte\n" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s zrejme nie je RPM balík\n" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "otázka na %s zlyhala\n" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "otázka na spec-súbor %s zlyhala, nie je mo¾né analyzova»\n" -#: lib/query.c:591 +#: lib/query.c:611 #, fuzzy msgid "no packages\n" msgstr "nájdených %d balíkov\n" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s neobsahuje ¾iadne balíky\n" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "¾iadny z balíkov nespú¹»a %s\n" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "¾iadny z balíkov nevy¾aduje %s\n" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "¾iadny z balíkov neposkytuje %s\n" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "súbor %s: %s\n" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "chybné èíslo balíku: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "po¾aduje sa záznam èíslo %d\n" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" @@ -3970,24 +3970,24 @@ msgstr "vykonanie skriptu zlyhalo" msgid "don't verify files in package" msgstr "zobrazi» súbory v balíku" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" "v balíku chýba tak meno pou¾ívateµa, ako aj zoznamy identifikácií (nemalo by " "sa nikdy sta»)" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" "v balíku chýba tak meno skupiny, ako aj zoznamy identifikácií (nemalo by sa " "nikdy sta»)" -#: lib/verify.c:285 -#, c-format -msgid "missing %s\n" +#: lib/verify.c:299 +#, fuzzy, c-format +msgid "missing %s" msgstr "chýbajúce %s\n" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " diff --git a/po/sl.po b/po/sl.po index 48e6033..b62d31f 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.115 2000/12/21 21:07:44 jbj Exp $ +# $Id: sl.po,v 1.116 2000/12/26 13:10:21 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -2785,13 +2785,13 @@ msgid " file: %s action: %s\n" msgstr " datoteka: %s akcija: %s\n" #: lib/install.c:215 -#, c-format -msgid "user %s does not exist - using root" +#, fuzzy, c-format +msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" #: lib/install.c:223 -#, c-format -msgid "group %s does not exist - using root" +#, fuzzy, c-format +msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" #. this would probably be a good place to check if disk space @@ -2873,12 +2873,12 @@ msgstr "presko #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "opozorilo: %s ustvarjen kot %s" #: lib/install.c:1098 #, fuzzy, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "opozorilo: %s shranjen kot %s" #: lib/install.c:1189 @@ -3150,124 +3150,124 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s" #: lib/query.c:151 -#, c-format -msgid "error in format: %s\n" +#, fuzzy, c-format +msgid "incorrect format: %s\n" msgstr "napaka v obliki: %s\n" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "(ne vsebuje datotek)" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "normalno " -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "nadome¹èeno " -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "ni name¹èeno " -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "omre¾ni " -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "(neznano %3d) " -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "(brez stanja) " -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id" -#: lib/query.c:388 +#: lib/query.c:405 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "ni mo¾no poizvedeti o %s: %s\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s najverjetneje ni paket RPM\n" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "poizvedba po %s je bila neuspe¹na\n" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "poizvedba po datoteki spec. %s je bila neuspe¹na, razèlemba ni mo¾na\n" -#: lib/query.c:591 +#: lib/query.c:611 #, fuzzy msgid "no packages\n" msgstr "ni paketov\n" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s ne vsebuje nobenega paketa\n" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "noben paket ne pro¾i %s\n" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "noben paket ne potrebuje %s\n" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "noben paket ne nudi %s\n" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "datoteka %s: %s\n" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "datoteka %s ni del nobenega paketa\n" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "neveljavna ¹tevilka paketa: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "¹tevilka zapisa paketa: %d\n" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "zapisa %d ni mo¾no prebrati\n" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" @@ -3979,22 +3979,22 @@ msgstr "skript se ni uspe msgid "don't verify files in package" msgstr "brez preverjanja datotek v paketu" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" "v paketu manjka tako seznam uporabnikov kot identitet (to se ne sme zgoditi)" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" "v paketu manjka tako seznam skupin kot identitet (to se ne sme zgoditi)" -#: lib/verify.c:285 -#, c-format -msgid "missing %s\n" +#: lib/verify.c:299 +#, fuzzy, c-format +msgid "missing %s" msgstr "manjka %s\n" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " diff --git a/po/sr.po b/po/sr.po index 9f09bfd..d259ed0 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" @@ -2789,13 +2789,13 @@ msgstr "neuspelo otvaranje %s: %s" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 -#, c-format -msgid "group %s does not exist - using root" -msgstr "" +#, fuzzy, c-format +msgid "group %s does not exist - using root\n" +msgstr "grupa %s ne sadr¾i nijedan paket\n" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error @@ -2878,13 +2878,13 @@ msgstr "gre #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " #: lib/install.c:1098 -#, c-format -msgid "%s saved as %s" -msgstr "" +#, fuzzy, c-format +msgid "%s saved as %s\n" +msgstr "Ne mogu da otvorim datoteku %s: " #: lib/install.c:1189 msgid "running postinstall scripts (if any)\n" @@ -3168,125 +3168,125 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/query.c:151 -#, c-format -msgid "error in format: %s\n" +#, fuzzy, c-format +msgid "incorrect format: %s\n" msgstr "gre¹ka u formatu: %s\n" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "(nema datoteka)" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 #, fuzzy msgid "not installed " msgstr "paket %s nije instaliran\n" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, fuzzy, c-format msgid "(unknown %3d) " msgstr "(nepoznat tip)" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ne lièi na RPM paket\n" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "upit nad %s neuspeo\n" -#: lib/query.c:568 +#: lib/query.c:588 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "upit nad %s neuspeo\n" -#: lib/query.c:591 +#: lib/query.c:611 #, fuzzy msgid "no packages\n" msgstr "upit nad svim paketima" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "nijedan paket ne aktivira %s\n" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "nijedan paket ne zahteva %s\n" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "nijedan paket ne obezbeðuje %s\n" -#: lib/query.c:662 +#: lib/query.c:684 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -3986,20 +3986,20 @@ msgstr "neuspelo izvr msgid "don't verify files in package" msgstr "instaliraj paket" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, fuzzy, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "nedostaje { posle %" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " diff --git a/po/sv.po b/po/sv.po index af1c50b..8093e96 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: 2000-10-09 22:31+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -2693,13 +2693,13 @@ msgid " file: %s action: %s\n" msgstr " fil: %s åtgärd: %s\n" #: lib/install.c:215 -#, c-format -msgid "user %s does not exist - using root" +#, fuzzy, c-format +msgid "user %s does not exist - using root\n" msgstr "användaren %s finns inte - använder root" #: lib/install.c:223 -#, c-format -msgid "group %s does not exist - using root" +#, fuzzy, c-format +msgid "group %s does not exist - using root\n" msgstr "gruppen %s finns inte - använder root" #. this would probably be a good place to check if disk space @@ -2781,12 +2781,12 @@ msgstr "hoppar #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "varning: %s skapades som %s" #: lib/install.c:1098 #, fuzzy, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "varning: %s sparades som %s" #: lib/install.c:1189 @@ -3044,123 +3044,123 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "okänt fel %d uppträdde under manipulation av paket %s-%s-%s" #: lib/query.c:151 -#, c-format -msgid "error in format: %s\n" +#, fuzzy, c-format +msgid "incorrect format: %s\n" msgstr "fel i format: %s\n" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "(innehåller inga filer)" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "normal " -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "ersatt " -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "oinstallerat " -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "nätdelad " -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "(okänd %3d) " -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "(ej tillstnd) " -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "paketet har varken filägare eller id-listor" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "kan inte fråga om %s: %s\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades öppna %s: %s\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "källpaket i gammalt format går ej att fråga om\n" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s verkar inte vara ett RPM-paket\n" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "fråga om %s misslyckades\n" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "fråga om spec-fil %s misslyckades, kan inte parsa\n" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "inga paket\n" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupp %s innehåller inga paket\n" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "inga paketutlösare %s\n" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "inget paket behöver %s\n" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "inget paket tillhandahåller %s\n" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "fil %s: %s\n" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "filen %s tillhör inget paket\n" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "felaktigt paketnummer: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "paketpost nummer: %u\n" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "post %d kunde inte läsas\n" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -3869,22 +3869,22 @@ msgstr "k msgid "don't verify files in package" msgstr "verifiera inte filerna i paketet" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" "paket saknar både användarnamn och id-listor (detta borde aldrig inträffa)" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" "paket saknar både gruppnamn och id-listor (detta borde aldrig inträffa)" -#: lib/verify.c:285 -#, c-format -msgid "missing %s\n" +#: lib/verify.c:299 +#, fuzzy, c-format +msgid "missing %s" msgstr "saknas %s\n" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "Ouppfyllda beroenden för %s-%s-%s: " diff --git a/po/tr.po b/po/tr.po index 860b108..d985fbb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2842,13 +2842,13 @@ msgstr "%s a #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 -#, c-format -msgid "group %s does not exist - using root" -msgstr "" +#, fuzzy, c-format +msgid "group %s does not exist - using root\n" +msgstr "%s grubu hiç paket içermiyor\n" #. this would probably be a good place to check if disk space #. was used up - if so, we should return a different error @@ -2931,13 +2931,13 @@ msgstr "hata: %s atlan #: lib/install.c:1062 #, fuzzy, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "%s dosyasý açýlamýyor: " #: lib/install.c:1098 -#, c-format -msgid "%s saved as %s" -msgstr "" +#, fuzzy, c-format +msgid "%s saved as %s\n" +msgstr "%s dosyasý açýlamýyor: " #: lib/install.c:1189 msgid "running postinstall scripts (if any)\n" @@ -3225,125 +3225,125 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/query.c:151 -#, c-format -msgid "error in format: %s\n" +#, fuzzy, c-format +msgid "incorrect format: %s\n" msgstr "format hatasý: %s\n" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "(hiç dosya içermiyor)" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 #, fuzzy msgid "not installed " msgstr "%s pakedi yüklenmemiþ\n" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, fuzzy, c-format msgid "(unknown %3d) " msgstr "(bilinmeyen tip)" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, fuzzy, c-format msgid "can't query %s: %s\n" msgstr "hata: %s eriþilemiyor\n" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s 'ye erisimde belirtilen hata oluþtu: %s\n" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "eski tip kaynak paketleri sorgulanamýyor\n" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s bir RPM paketi deðil (gibi)\n" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n" -#: lib/query.c:568 +#: lib/query.c:588 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n" -#: lib/query.c:591 +#: lib/query.c:611 #, fuzzy msgid "no packages\n" msgstr "Tüm paketleri sorgulama" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "%s grubu hiç paket içermiyor\n" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "hiç bir paket %s tetiklemiyor\n" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "hiç bir paket %s gerektirmiyor\n" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "hiç bir paket %s saðlamýyor\n" -#: lib/query.c:662 +#: lib/query.c:684 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "%s açýlamadý: %s" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "%s dosyasý, hiç bir pakete ait deðil\n" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "geçersiz paket numarsý: %s\n" -#: lib/query.c:694 +#: lib/query.c:717 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "geçersiz paket numarsý: %s\n" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "%d numaralý kayýt okunamadý\n" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "%s pakedi yüklenmemiþ\n" @@ -4043,20 +4043,20 @@ msgstr "betik (script) msgid "don't verify files in package" msgstr "paket yüklemek" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, fuzzy, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "% den sonra eksik {" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "%s-%s-%s 'nin baðýmlýlýk sorunlarý: " diff --git a/po/uk.po b/po/uk.po index 7033298..376aa0a 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,12 +2630,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2716,12 +2716,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2977,122 +2977,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3774,20 +3774,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/wa.po b/po/wa.po index 7033298..376aa0a 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,12 +2630,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2716,12 +2716,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2977,122 +2977,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3774,20 +3774,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/zh.po b/po/zh.po index 7033298..376aa0a 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,12 +2630,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2716,12 +2716,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2977,122 +2977,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3774,20 +3774,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 7033298..376aa0a 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-21 15:42-0500\n" +"POT-Creation-Date: 2000-12-25 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,12 +2630,12 @@ msgstr "" #: lib/install.c:215 #, c-format -msgid "user %s does not exist - using root" +msgid "user %s does not exist - using root\n" msgstr "" #: lib/install.c:223 #, c-format -msgid "group %s does not exist - using root" +msgid "group %s does not exist - using root\n" msgstr "" #. this would probably be a good place to check if disk space @@ -2716,12 +2716,12 @@ msgstr "" #: lib/install.c:1062 #, c-format -msgid "%s created as %s" +msgid "%s created as %s\n" msgstr "" #: lib/install.c:1098 #, c-format -msgid "%s saved as %s" +msgid "%s saved as %s\n" msgstr "" #: lib/install.c:1189 @@ -2977,122 +2977,122 @@ msgstr "" #: lib/query.c:151 #, c-format -msgid "error in format: %s\n" +msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:213 +#: lib/query.c:223 msgid "(contains no files)" msgstr "" -#: lib/query.c:272 +#: lib/query.c:274 msgid "normal " msgstr "" -#: lib/query.c:274 +#: lib/query.c:276 msgid "replaced " msgstr "" -#: lib/query.c:276 +#: lib/query.c:278 msgid "not installed " msgstr "" -#: lib/query.c:278 +#: lib/query.c:280 msgid "net shared " msgstr "" -#: lib/query.c:280 +#: lib/query.c:282 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:284 +#: lib/query.c:287 msgid "(no state) " msgstr "" -#: lib/query.c:301 lib/query.c:344 +#: lib/query.c:306 lib/query.c:351 msgid "package has neither file owner or id lists" msgstr "" -#: lib/query.c:388 +#: lib/query.c:405 #, c-format msgid "can't query %s: %s\n" msgstr "" #. XXX Fstrerror -#: lib/query.c:504 +#: lib/query.c:521 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:541 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:531 lib/rpminstall.c:312 +#: lib/query.c:550 lib/rpminstall.c:312 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" -#: lib/query.c:535 +#: lib/query.c:554 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:568 +#: lib/query.c:588 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:591 +#: lib/query.c:611 msgid "no packages\n" msgstr "" -#: lib/query.c:601 +#: lib/query.c:622 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:611 +#: lib/query.c:632 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:642 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:632 +#: lib/query.c:653 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:662 +#: lib/query.c:684 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:665 +#: lib/query.c:688 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:714 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:694 +#: lib/query.c:717 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:698 +#: lib/query.c:722 #, c-format msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:709 lib/rpminstall.c:546 +#: lib/query.c:733 lib/rpminstall.c:546 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3774,20 +3774,20 @@ msgstr "" msgid "don't verify files in package" msgstr "" -#: lib/verify.c:218 +#: lib/verify.c:219 msgid "package lacks both user name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:236 +#: lib/verify.c:237 msgid "package lacks both group name and id lists (this should never happen)" msgstr "" -#: lib/verify.c:285 +#: lib/verify.c:299 #, c-format -msgid "missing %s\n" +msgid "missing %s" msgstr "" -#: lib/verify.c:347 +#: lib/verify.c:380 #, c-format msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 83632d2..c11a910 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -1287,7 +1287,7 @@ static PyObject * hdrUnload(hdrObject * s, PyObject * args) { */ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { int fileNumber; - int verifyResult; + rpmVerifyAttrs verifyResult = 0; PyObject * list, * tuple, * attrName; int type, count; struct stat sb; @@ -1303,7 +1303,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { fileNumber = (int) PyInt_AsLong(args); - if (rpmVerifyFile("", s->h, fileNumber, &verifyResult, 0)) { + if (rpmVerifyFile("", s->h, fileNumber, &verifyResult, RPMVERIFY_NONE)) { Py_INCREF(Py_None); return Py_None; } diff --git a/rpm.spec b/rpm.spec index 970f989..d94c2d6 100644 --- a/rpm.spec +++ b/rpm.spec @@ -13,7 +13,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 4.0.2 Version: %{version} -Release: 0.7 +Release: 0.8 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -309,6 +309,10 @@ fi %{__prefix}/include/popt.h %changelog +* Tue Dec 26 2000 Jeff Johnson +- send query/verify output through rpmlog(). +- resurrect rpmErrorSetCallback() and rpmErrorString(). + * Thu Dec 21 2000 Jeff Johnson - immutable headers, once installed by rpm3, need to lose immutablity. - fix: removed headers from db need a headerCopy(). diff --git a/rpm.spec.in b/rpm.spec.in index d9406e8..93bc123 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -13,7 +13,7 @@ Summary: The Red Hat package management system. Name: rpm %define version @VERSION@ Version: %{version} -Release: 0.7 +Release: 0.8 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -309,6 +309,10 @@ fi %{__prefix}/include/popt.h %changelog +* Tue Dec 26 2000 Jeff Johnson +- send query/verify output through rpmlog(). +- resurrect rpmErrorSetCallback() and rpmErrorString(). + * Thu Dec 21 2000 Jeff Johnson - immutable headers, once installed by rpm3, need to lose immutablity. - fix: removed headers from db need a headerCopy(). diff --git a/rpmio/rpmerr.h b/rpmio/rpmerr.h index 4fa1d9c..b957e42 100644 --- a/rpmio/rpmerr.h +++ b/rpmio/rpmerr.h @@ -72,7 +72,9 @@ typedef enum rpmerrCode_e { RPMERR_BADFILENAME = _em(120), /*!< @todo Document. */ RPMERR_OPEN = _em(121), /*!< @todo Document. */ RPMERR_POPEN = _em(122), /*!< @todo Document. */ - RPMERR_NOTREG = _em(122), /*!< File %s is not a regular file */ + RPMERR_NOTREG = _em(123), /*!< File %s is not a regular file */ + RPMERR_QUERY = _em(124), /*!< @todo Document. */ + RPMERR_QFMT = _em(125), /*!< @todo Document. */ RPMERR_BADSIGTYPE = _em(200), /*!< Unknown signature type */ RPMERR_SIGGEN = _em(201) /*!< Error generating signature */ diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c index 99dddb3..0a6a310 100644 --- a/rpmio/rpmlog.c +++ b/rpmio/rpmlog.c @@ -166,3 +166,13 @@ void rpmlog (int code, const char *fmt, ...) vrpmlog(code, fmt, ap); va_end(ap); } + +const char * rpmErrorString(void) +{ + return rpmlogMessage(); +} + +rpmlogCallback rpmErrorSetCallback(rpmlogCallback cb) +{ + return rpmlogSetCallback(cb); +} diff --git a/rpmio/rpmlog.h b/rpmio/rpmlog.h index 02d3d99..d0df72e 100644 --- a/rpmio/rpmlog.h +++ b/rpmio/rpmlog.h @@ -206,6 +206,19 @@ void rpmlog (int pri, const char *fmt, ...); */ rpmlogCallback rpmlogSetCallback(rpmlogCallback cb); +/** + * Set rpmlog callback function. + * @deprecated gnorpm needs, use rpmlogSetCallback() instead. + */ +rpmlogCallback rpmErrorSetCallback(rpmlogCallback cb); + +/** + * Return text of last rpmError() message. + * @deprecated gnorpm needs, use rpmlogMessage() instead. + * @return text of last message + */ +/*@observer@*/ const char * rpmErrorString(void); + #ifdef __cplusplus } #endif -- 2.7.4